1
=== modified file 'src/platforms/mesa/server/kms/display_buffer.cpp'
2
--- src/platforms/mesa/server/kms/display_buffer.cpp	2017-07-28 17:00:43 +0000
3
+++ src/platforms/mesa/server/kms/display_buffer.cpp	2017-10-14 01:05:56 +0000
4
@@ -32,7 +32,7 @@
5
32
#include <EGL/eglext.h>
32
#include <EGL/eglext.h>
6
33
#include MIR_SERVER_GL_H
33
#include MIR_SERVER_GL_H
7
34
#include <GLES2/gl2ext.h>
34
#include <GLES2/gl2ext.h>
9
35
#include <drm/drm_fourcc.h>
35
#include <drm_fourcc.h>
10
36
36
11
37
#include <sstream>
37
#include <sstream>
12
38
#include <stdexcept>
38
#include <stdexcept>
13
@@ -504,7 +504,7 @@
14
504
    make_current();
504
    make_current();
15
505
505
16
506
    listener->report_successful_egl_make_current_on_construction();
506
    listener->report_successful_egl_make_current_on_construction();
18
507
    
507
19
508
    glClear(GL_COLOR_BUFFER_BIT);
508
    glClear(GL_COLOR_BUFFER_BIT);
20
509
509
21
510
    surface.swap_buffers();
510
    surface.swap_buffers();
22
@@ -776,7 +776,7 @@
23
776
776
24
777
        visible_bypass_frame = scheduled_bypass_frame;
777
        visible_bypass_frame = scheduled_bypass_frame;
25
778
        scheduled_bypass_frame = nullptr;
778
        scheduled_bypass_frame = nullptr;
27
779
    
779
28
780
        visible_composite_frame = std::move(scheduled_composite_frame);
780
        visible_composite_frame = std::move(scheduled_composite_frame);
29
781
        scheduled_composite_frame = nullptr;
781
        scheduled_composite_frame = nullptr;
30
782
    }
782
    }
Reviewer	Review Type	Date Requested	Status
Brandon Schaefer (community)		2017-10-14	Approve on 2017-10-16
Mir CI Bot	continuous-integration		Approve on 2017-10-14
Review via email: mp+332270@code.launchpad.net
1	=== modified file 'src/platforms/mesa/server/kms/display_buffer.cpp'
2	--- src/platforms/mesa/server/kms/display_buffer.cpp 2017-07-28 17:00:43 +0000
3	+++ src/platforms/mesa/server/kms/display_buffer.cpp 2017-10-14 01:05:56 +0000
4	@@ -32,7 +32,7 @@
5	32	#include <EGL/eglext.h>	32	#include <EGL/eglext.h>
6	33	#include MIR_SERVER_GL_H	33	#include MIR_SERVER_GL_H
7	34	#include <GLES2/gl2ext.h>	34	#include <GLES2/gl2ext.h>
9	35	#include <drm/drm_fourcc.h>	35	#include <drm_fourcc.h>
10	36		36
11	37	#include <sstream>	37	#include <sstream>
12	38	#include <stdexcept>	38	#include <stdexcept>
13	@@ -504,7 +504,7 @@
14	504	make_current();	504	make_current();
15	505		505
16	506	listener->report_successful_egl_make_current_on_construction();	506	listener->report_successful_egl_make_current_on_construction();
18	507		507
19	508	glClear(GL_COLOR_BUFFER_BIT);	508	glClear(GL_COLOR_BUFFER_BIT);
20	509		509
21	510	surface.swap_buffers();	510	surface.swap_buffers();
22	@@ -776,7 +776,7 @@
23	776		776
24	777	visible_bypass_frame = scheduled_bypass_frame;	777	visible_bypass_frame = scheduled_bypass_frame;
25	778	scheduled_bypass_frame = nullptr;	778	scheduled_bypass_frame = nullptr;
27	779		779
28	780	visible_composite_frame = std::move(scheduled_composite_frame);	780	visible_composite_frame = std::move(scheduled_composite_frame);
29	781	scheduled_composite_frame = nullptr;	781	scheduled_composite_frame = nullptr;
30	782	}	782	}