1
=== modified file 'examples/CMakeLists.txt'
2
--- examples/CMakeLists.txt	2017-05-26 08:33:17 +0000
3
+++ examples/CMakeLists.txt	2017-06-05 11:06:43 +0000
4
@@ -153,6 +153,10 @@
5
153
mir_add_wrapped_executable(mir_demo_client_eglsquare eglsquare.cpp)
153
mir_add_wrapped_executable(mir_demo_client_eglsquare eglsquare.cpp)
6
154
target_link_libraries(mir_demo_client_eglsquare eglapp)
154
target_link_libraries(mir_demo_client_eglsquare eglapp)
7
155
155
8
156
if ("${CMAKE_CXX_COMPILER}" MATCHES "clang")
9
157
  target_link_libraries(mir_demo_client_eglsquare atomic)
10
158
endif()
11
159
12
156
mir_add_wrapped_executable(mir_demo_client_flicker
160
mir_add_wrapped_executable(mir_demo_client_flicker
13
157
  flicker.c
161
  flicker.c
14
158
)
162
)
15
159
163
16
=== modified file 'examples/eglsquare.cpp'
17
--- examples/eglsquare.cpp	2017-05-23 10:51:47 +0000
18
+++ examples/eglsquare.cpp	2017-06-05 11:06:43 +0000
19
@@ -26,6 +26,8 @@
20
26
#include <cstring>
26
#include <cstring>
21
27
#include <unistd.h>
27
#include <unistd.h>
22
28
#include <signal.h>
28
#include <signal.h>
23
29
#include <condition_variable>
24
30
#include <atomic>
25
29
31
26
30
#include "client_helpers.h"
32
#include "client_helpers.h"
27
31
33
28
@@ -107,11 +109,24 @@
29
107
        dimensions(active_output_dimensions(connection)),
109
        dimensions(active_output_dimensions(connection)),
30
108
        context{connection, swap_interval, dimensions.width, dimensions.height},
110
        context{connection, swap_interval, dimensions.width, dimensions.height},
31
109
        window{connection, dimensions.width, dimensions.height, context},
111
        window{connection, dimensions.width, dimensions.height, context},
33
110
        program{context, dimensions.width, dimensions.height}
112
        program{context, dimensions.width, dimensions.height},
34
113
        pos{Pos{0,0}},
35
114
        worker{[this] { do_work(); }}
36
111
    {
115
    {
37
112
        mir_window_set_event_handler(window, &on_event, this);
116
        mir_window_set_event_handler(window, &on_event, this);
38
113
    }
117
    }
39
114
118
40
119
    ~SquareRenderingSurface()
41
120
    {
42
121
        {
43
122
            std::lock_guard<decltype(mutex)> lock{mutex};
44
123
            running = false;
45
124
            cv.notify_one();
46
125
        }
47
126
48
127
        if (worker.joinable()) worker.join();
49
128
    }
50
129
51
115
    void on_event(MirEvent const* ev)
130
    void on_event(MirEvent const* ev)
52
116
    {
131
    {
53
117
        if (mir_event_get_type(ev) != mir_event_type_input)
132
        if (mir_event_get_type(ev) != mir_event_type_input)
54
@@ -135,11 +150,9 @@
55
135
        {
150
        {
56
136
            return;
151
            return;
57
137
        }
152
        }
63
138
        context.make_current();
153
64
139
        program.draw(
154
        pos = Pos{x, y};
65
140
            x/static_cast<float>(dimensions.width)*2.0 - 1.0,
155
        cv.notify_one();
61
141
            y/static_cast<float>(dimensions.height)*-2.0 + 1.0);
62
142
        context.swapbuffers();
66
143
    }
156
    }
67
144
157
68
145
    SquareRenderingSurface(SquareRenderingSurface const&) = delete;
158
    SquareRenderingSurface(SquareRenderingSurface const&) = delete;
69
@@ -184,6 +197,35 @@
70
184
        auto surface = reinterpret_cast<SquareRenderingSurface*>(context);
197
        auto surface = reinterpret_cast<SquareRenderingSurface*>(context);
71
185
        if (surface) surface->on_event(event);
198
        if (surface) surface->on_event(event);
72
186
    }
199
    }
73
200
74
201
private:
75
202
    void do_work()
76
203
    {
77
204
        std::unique_lock<decltype(mutex)> lock(mutex);
78
205
79
206
        while (true)
80
207
        {
81
208
            cv.wait(lock);
82
209
83
210
            if (!running) return;
84
211
85
212
            Pos  pos = this->pos;
86
213
87
214
            context.make_current();
88
215
            program.draw(
89
216
                pos.x/static_cast<float>(dimensions.width)*2.0 - 1.0,
90
217
                pos.y/static_cast<float>(dimensions.height)*-2.0 + 1.0);
91
218
            context.swapbuffers();
92
219
        }
93
220
    }
94
221
95
222
    struct Pos { float x; float y; };
96
223
    std::atomic<Pos> pos;
97
224
98
225
    std::thread worker;
99
226
    std::condition_variable cv;
100
227
    std::mutex mutex;
101
228
    bool running{true};
102
187
};
229
};
103
188
}
230
}
104
189
231
Reviewer	Review Type	Date Requested	Status
Daniel van Vugt		2017-06-05	Approve on 2017-06-06
Mir CI Bot	continuous-integration		Approve on 2017-06-05
Review via email: mp+325066@code.launchpad.net
1	=== modified file 'examples/CMakeLists.txt'
2	--- examples/CMakeLists.txt 2017-05-26 08:33:17 +0000
3	+++ examples/CMakeLists.txt 2017-06-05 11:06:43 +0000
4	@@ -153,6 +153,10 @@
5	153	mir_add_wrapped_executable(mir_demo_client_eglsquare eglsquare.cpp)	153	mir_add_wrapped_executable(mir_demo_client_eglsquare eglsquare.cpp)
6	154	target_link_libraries(mir_demo_client_eglsquare eglapp)	154	target_link_libraries(mir_demo_client_eglsquare eglapp)
7	155		155
8			156	if ("${CMAKE_CXX_COMPILER}" MATCHES "clang")
9			157	target_link_libraries(mir_demo_client_eglsquare atomic)
10			158	endif()
11			159
12	156	mir_add_wrapped_executable(mir_demo_client_flicker	160	mir_add_wrapped_executable(mir_demo_client_flicker
13	157	flicker.c	161	flicker.c
14	158	)	162	)
15	159		163
16	=== modified file 'examples/eglsquare.cpp'
17	--- examples/eglsquare.cpp 2017-05-23 10:51:47 +0000
18	+++ examples/eglsquare.cpp 2017-06-05 11:06:43 +0000
19	@@ -26,6 +26,8 @@
20	26	#include <cstring>	26	#include <cstring>
21	27	#include <unistd.h>	27	#include <unistd.h>
22	28	#include <signal.h>	28	#include <signal.h>
23			29	#include <condition_variable>
24			30	#include <atomic>
25	29		31
26	30	#include "client_helpers.h"	32	#include "client_helpers.h"
27	31		33
28	@@ -107,11 +109,24 @@
29	107	dimensions(active_output_dimensions(connection)),	109	dimensions(active_output_dimensions(connection)),
30	108	context{connection, swap_interval, dimensions.width, dimensions.height},	110	context{connection, swap_interval, dimensions.width, dimensions.height},
31	109	window{connection, dimensions.width, dimensions.height, context},	111	window{connection, dimensions.width, dimensions.height, context},
33	110	program{context, dimensions.width, dimensions.height}	112	program{context, dimensions.width, dimensions.height},
34			113	pos{Pos{0,0}},
35			114	worker{[this] { do_work(); }}
36	111	{	115	{
37	112	mir_window_set_event_handler(window, &on_event, this);	116	mir_window_set_event_handler(window, &on_event, this);
38	113	}	117	}
39	114		118
40			119	~SquareRenderingSurface()
41			120	{
42			121	{
43			122	std::lock_guard<decltype(mutex)> lock{mutex};
44			123	running = false;
45			124	cv.notify_one();
46			125	}
47			126
48			127	if (worker.joinable()) worker.join();
49			128	}
50			129
51	115	void on_event(MirEvent const* ev)	130	void on_event(MirEvent const* ev)
52	116	{	131	{
53	117	if (mir_event_get_type(ev) != mir_event_type_input)	132	if (mir_event_get_type(ev) != mir_event_type_input)
54	@@ -135,11 +150,9 @@
55	135	{	150	{
56	136	return;	151	return;
57	137	}	152	}
63	138	context.make_current();	153
64	139	program.draw(	154	pos = Pos{x, y};
65	140	x/static_cast<float>(dimensions.width)*2.0 - 1.0,	155	cv.notify_one();
61	141	y/static_cast<float>(dimensions.height)*-2.0 + 1.0);
62	142	context.swapbuffers();
66	143	}	156	}
67	144		157
68	145	SquareRenderingSurface(SquareRenderingSurface const&) = delete;	158	SquareRenderingSurface(SquareRenderingSurface const&) = delete;
69	@@ -184,6 +197,35 @@
70	184	auto surface = reinterpret_cast<SquareRenderingSurface*>(context);	197	auto surface = reinterpret_cast<SquareRenderingSurface*>(context);
71	185	if (surface) surface->on_event(event);	198	if (surface) surface->on_event(event);
72	186	}	199	}
73			200
74			201	private:
75			202	void do_work()
76			203	{
77			204	std::unique_lock<decltype(mutex)> lock(mutex);
78			205
79			206	while (true)
80			207	{
81			208	cv.wait(lock);
82			209
83			210	if (!running) return;
84			211
85			212	Pos pos = this->pos;
86			213
87			214	context.make_current();
88			215	program.draw(
89			216	pos.x/static_cast<float>(dimensions.width)*2.0 - 1.0,
90			217	pos.y/static_cast<float>(dimensions.height)*-2.0 + 1.0);
91			218	context.swapbuffers();
92			219	}
93			220	}
94			221
95			222	struct Pos { float x; float y; };
96			223	std::atomic<Pos> pos;
97			224
98			225	std::thread worker;
99			226	std::condition_variable cv;
100			227	std::mutex mutex;
101			228	bool running{true};
102	187	};	229	};
103	188	}	230	}
104	189		231