1
=== modified file 'examples/server_example_adorning_compositor.cpp'
2
--- examples/server_example_adorning_compositor.cpp	2016-06-02 05:33:50 +0000
3
+++ examples/server_example_adorning_compositor.cpp	2016-09-19 09:16:51 +0000
4
@@ -183,7 +183,7 @@
5
183
    remove_occlusions_from(scene_sequence, db.view_area());
183
    remove_occlusions_from(scene_sequence, db.view_area());
6
184
184
7
185
    //note: If what should be drawn is expressible as a SceneElementSequence,
185
    //note: If what should be drawn is expressible as a SceneElementSequence,
9
186
    //      mg::DisplayBuffer::post_renderables_if_optimizable() should be used,
186
    //      mg::DisplayBuffer::overlay() should be used,
10
187
    //      to give the the display hardware a chance at an optimized render of
187
    //      to give the the display hardware a chance at an optimized render of
11
188
    //      the scene. In this example though, we want some custom elements, so
188
    //      the scene. In this example though, we want some custom elements, so
12
189
    //      we'll always use GLES.
189
    //      we'll always use GLES.
13
190
190
14
=== modified file 'include/platform/mir/graphics/display_buffer.h'
15
--- include/platform/mir/graphics/display_buffer.h	2016-05-03 06:55:25 +0000
16
+++ include/platform/mir/graphics/display_buffer.h	2016-09-19 09:16:51 +0000
17
@@ -58,16 +58,14 @@
18
58
     *      The renderables that should appear on the screen if the hardware
58
     *      The renderables that should appear on the screen if the hardware
19
59
     *      is capable of optmizing that list somehow. If what you want
59
     *      is capable of optmizing that list somehow. If what you want
20
60
     *      displayed on the screen cannot be represented by a RenderableList,
60
     *      displayed on the screen cannot be represented by a RenderableList,
22
61
     *      then you should draw using OpenGL and use post_update()
61
     *      then you should render using a graphics library like OpenGL.
23
62
     *  \returns
62
     *  \returns
30
63
     *      true if the hardware can optimize the rendering of the list.
63
     *      True if the hardware can (and has) fully composite/overlay the list;
31
64
     *      When this call completes, the renderlist will have been posted
64
     *      False if the hardware platform cannot composite the list, and the
32
65
     *      to the screen.
65
     *      caller should then render the list another way using a graphics
33
66
     *      false if the hardware platform cannot optimize the list. The screen
66
     *      library such as OpenGL.
28
67
     *      will not be updated. The caller should render the list another way,
29
68
     *      and post using post_update()
34
69
    **/
67
    **/
36
70
    virtual bool post_renderables_if_optimizable(RenderableList const& renderlist) = 0;
68
    virtual bool overlay(RenderableList const& renderlist) = 0;
37
71
69
38
72
    /** Returns the orientation of the display buffer relative to how the
70
    /** Returns the orientation of the display buffer relative to how the
39
73
     *  user should see it (the orientation of the output).
71
     *  user should see it (the orientation of the output).
40
74
72
41
=== modified file 'include/test/mir/test/doubles/null_display_buffer.h'
42
--- include/test/mir/test/doubles/null_display_buffer.h	2016-05-03 06:55:25 +0000
43
+++ include/test/mir/test/doubles/null_display_buffer.h	2016-09-19 09:16:51 +0000
44
@@ -32,7 +32,7 @@
45
32
{
32
{
46
33
public:
33
public:
47
34
    geometry::Rectangle view_area() const override { return geometry::Rectangle(); }
34
    geometry::Rectangle view_area() const override { return geometry::Rectangle(); }
49
35
    bool post_renderables_if_optimizable(graphics::RenderableList const&) override { return false; }
35
    bool overlay(graphics::RenderableList const&) override { return false; }
50
36
    MirOrientation orientation() const override { return mir_orientation_normal; }
36
    MirOrientation orientation() const override { return mir_orientation_normal; }
51
37
    MirMirrorMode mirror_mode() const override { return mir_mirror_mode_none; }
37
    MirMirrorMode mirror_mode() const override { return mir_mirror_mode_none; }
52
38
    NativeDisplayBuffer* native_display_buffer() override { return this; }
38
    NativeDisplayBuffer* native_display_buffer() override { return this; }
53
39
39
54
=== modified file 'playground/demo-shell/demo_compositor.cpp'
55
--- playground/demo-shell/demo_compositor.cpp	2016-05-03 06:55:25 +0000
56
+++ playground/demo-shell/demo_compositor.cpp	2016-09-19 09:16:51 +0000
57
@@ -118,7 +118,7 @@
58
118
118
59
119
    if (!nonrenderlist_elements &&
119
    if (!nonrenderlist_elements &&
60
120
        viewport == display_buffer.view_area() &&  // no bypass while zoomed
120
        viewport == display_buffer.view_area() &&  // no bypass while zoomed
62
121
        display_buffer.post_renderables_if_optimizable(renderable_list))
121
        display_buffer.overlay(renderable_list))
63
122
    {
122
    {
64
123
        report->renderables_in_frame(this, renderable_list);
123
        report->renderables_in_frame(this, renderable_list);
65
124
        renderer.suspend();
124
        renderer.suspend();
66
125
125
67
=== modified file 'src/platform/symbols.map'
68
--- src/platform/symbols.map	2016-09-02 16:51:10 +0000
69
+++ src/platform/symbols.map	2016-09-19 09:16:51 +0000
70
@@ -26,7 +26,7 @@
71
26
    mir::graphics::DisplayBuffer::native_display_buffer*;
26
    mir::graphics::DisplayBuffer::native_display_buffer*;
72
27
    mir::graphics::DisplayBuffer::operator*;
27
    mir::graphics::DisplayBuffer::operator*;
73
28
    mir::graphics::DisplayBuffer::orientation*;
28
    mir::graphics::DisplayBuffer::orientation*;
75
29
    mir::graphics::DisplayBuffer::post_renderables_if_optimizable*;
29
    mir::graphics::DisplayBuffer::overlay*;
76
30
    mir::graphics::DisplayBuffer::view_area*;
30
    mir::graphics::DisplayBuffer::view_area*;
77
31
    mir::graphics::Display::configuration*;
31
    mir::graphics::Display::configuration*;
78
32
    mir::graphics::DisplayConfiguration::DisplayConfiguration*;
32
    mir::graphics::DisplayConfiguration::DisplayConfiguration*;
79
33
33
80
=== modified file 'src/platforms/android/server/display_buffer.cpp'
81
--- src/platforms/android/server/display_buffer.cpp	2016-05-03 06:55:25 +0000
82
+++ src/platforms/android/server/display_buffer.cpp	2016-09-19 09:16:51 +0000
83
@@ -79,7 +79,7 @@
84
79
    gl_context.release_current();
79
    gl_context.release_current();
85
80
}
80
}
86
81
81
88
82
bool mga::DisplayBuffer::post_renderables_if_optimizable(RenderableList const& renderlist)
82
bool mga::DisplayBuffer::overlay(RenderableList const& renderlist)
89
83
{
83
{
90
84
    if (!overlay_enabled ||
84
    if (!overlay_enabled ||
91
85
        !display_device->compatible_renderlist(renderlist) ||
85
        !display_device->compatible_renderlist(renderlist) ||
92
86
86
93
=== modified file 'src/platforms/android/server/display_buffer.h'
94
--- src/platforms/android/server/display_buffer.h	2016-05-03 06:55:25 +0000
95
+++ src/platforms/android/server/display_buffer.h	2016-09-19 09:16:51 +0000
96
@@ -63,7 +63,7 @@
97
63
    void make_current() override;
63
    void make_current() override;
98
64
    void release_current() override;
64
    void release_current() override;
99
65
    void swap_buffers() override;
65
    void swap_buffers() override;
101
66
    bool post_renderables_if_optimizable(RenderableList const& renderlist) override;
66
    bool overlay(RenderableList const& renderlist) override;
102
67
    void bind() override;
67
    void bind() override;
103
68
68
104
69
    MirOrientation orientation() const override;
69
    MirOrientation orientation() const override;
105
70
70
106
=== modified file 'src/platforms/android/utils/render_overlays.cpp'
107
--- src/platforms/android/utils/render_overlays.cpp	2016-08-16 19:34:28 +0000
108
+++ src/platforms/android/utils/render_overlays.cpp	2016-09-19 09:16:51 +0000
109
@@ -214,7 +214,7 @@
110
214
            {
214
            {
111
215
                // TODO: Is make_current() really needed here?
215
                // TODO: Is make_current() really needed here?
112
216
                me::as_render_target(buffer)->make_current();
216
                me::as_render_target(buffer)->make_current();
114
217
                buffer.post_renderables_if_optimizable(renderlist);
217
                buffer.overlay(renderlist);
115
218
            });
218
            });
116
219
            group.post();
219
            group.post();
117
220
        });
220
        });
118
221
221
119
=== modified file 'src/platforms/android/utils/test_android_hardware_sanity.cpp'
120
--- src/platforms/android/utils/test_android_hardware_sanity.cpp	2016-08-22 14:34:05 +0000
121
+++ src/platforms/android/utils/test_android_hardware_sanity.cpp	2016-09-19 09:16:51 +0000
122
@@ -281,7 +281,7 @@
123
281
                std::make_shared<BasicRenderable>(buffer)
281
                std::make_shared<BasicRenderable>(buffer)
124
282
            };
282
            };
125
283
283
127
284
            db.post_renderables_if_optimizable(list);
284
            db.overlay(list);
128
285
        });
285
        });
129
286
        group.post();
286
        group.post();
130
287
    });
287
    });
131
288
288
132
=== modified file 'src/platforms/eglstream-kms/server/display.cpp'
133
--- src/platforms/eglstream-kms/server/display.cpp	2016-08-01 09:37:45 +0000
134
+++ src/platforms/eglstream-kms/server/display.cpp	2016-09-19 09:16:51 +0000
135
@@ -195,7 +195,7 @@
136
195
        return view_area_;
195
        return view_area_;
137
196
    }
196
    }
138
197
197
140
198
    bool post_renderables_if_optimizable(const mir::graphics::RenderableList& /*renderlist*/) override
198
    bool overlay(const mir::graphics::RenderableList& /*renderlist*/) override
141
199
    {
199
    {
142
200
        return false;
200
        return false;
143
201
    }
201
    }
144
202
202
145
=== modified file 'src/platforms/mesa/server/kms/display_buffer.cpp'
146
--- src/platforms/mesa/server/kms/display_buffer.cpp	2016-09-16 15:18:36 +0000
147
+++ src/platforms/mesa/server/kms/display_buffer.cpp	2016-09-19 09:16:51 +0000
148
@@ -198,7 +198,7 @@
149
198
    area = a;
198
    area = a;
150
199
}
199
}
151
200
200
153
201
bool mgm::DisplayBuffer::post_renderables_if_optimizable(RenderableList const& renderable_list)
201
bool mgm::DisplayBuffer::overlay(RenderableList const& renderable_list)
154
202
{
202
{
155
203
    if ((rotation == mir_orientation_normal) &&
203
    if ((rotation == mir_orientation_normal) &&
156
204
       (bypass_option == mgm::BypassOption::allowed))
204
       (bypass_option == mgm::BypassOption::allowed))
157
205
205
158
=== modified file 'src/platforms/mesa/server/kms/display_buffer.h'
159
--- src/platforms/mesa/server/kms/display_buffer.h	2016-05-03 06:55:25 +0000
160
+++ src/platforms/mesa/server/kms/display_buffer.h	2016-09-19 09:16:51 +0000
161
@@ -66,7 +66,7 @@
162
66
    void make_current() override;
66
    void make_current() override;
163
67
    void release_current() override;
67
    void release_current() override;
164
68
    void swap_buffers() override;
68
    void swap_buffers() override;
166
69
    bool post_renderables_if_optimizable(RenderableList const& renderlist) override;
69
    bool overlay(RenderableList const& renderlist) override;
167
70
    void bind() override;
70
    void bind() override;
168
71
71
169
72
    void for_each_display_buffer(
72
    void for_each_display_buffer(
170
73
73
171
=== modified file 'src/platforms/mesa/server/x11/graphics/display_buffer.cpp'
172
--- src/platforms/mesa/server/x11/graphics/display_buffer.cpp	2016-09-09 08:04:25 +0000
173
+++ src/platforms/mesa/server/x11/graphics/display_buffer.cpp	2016-09-19 09:16:51 +0000
174
@@ -66,7 +66,7 @@
175
66
        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot make uncurrent"));
66
        BOOST_THROW_EXCEPTION(mg::egl_error("Cannot make uncurrent"));
176
67
}
67
}
177
68
68
179
69
bool mgx::DisplayBuffer::post_renderables_if_optimizable(RenderableList const& /*renderlist*/)
69
bool mgx::DisplayBuffer::overlay(RenderableList const& /*renderlist*/)
180
70
{
70
{
181
71
    return false;
71
    return false;
182
72
}
72
}
183
73
73
184
=== modified file 'src/platforms/mesa/server/x11/graphics/display_buffer.h'
185
--- src/platforms/mesa/server/x11/graphics/display_buffer.h	2016-09-07 03:37:03 +0000
186
+++ src/platforms/mesa/server/x11/graphics/display_buffer.h	2016-09-19 09:16:51 +0000
187
@@ -53,7 +53,7 @@
188
53
    void release_current() override;
53
    void release_current() override;
189
54
    void swap_buffers() override;
54
    void swap_buffers() override;
190
55
    void bind() override;
55
    void bind() override;
192
56
    bool post_renderables_if_optimizable(RenderableList const& renderlist) override;
56
    bool overlay(RenderableList const& renderlist) override;
193
57
    void set_orientation(MirOrientation const new_orientation);
57
    void set_orientation(MirOrientation const new_orientation);
194
58
58
195
59
    MirOrientation orientation() const override;
59
    MirOrientation orientation() const override;
196
60
60
197
=== modified file 'src/server/compositor/default_display_buffer_compositor.cpp'
198
--- src/server/compositor/default_display_buffer_compositor.cpp	2016-08-26 19:01:27 +0000
199
+++ src/server/compositor/default_display_buffer_compositor.cpp	2016-09-19 09:16:51 +0000
200
@@ -72,7 +72,7 @@
201
72
     */
72
     */
202
73
    scene_elements.clear();  // Those in use are still in renderable_list
73
    scene_elements.clear();  // Those in use are still in renderable_list
203
74
74
205
75
    if (display_buffer.post_renderables_if_optimizable(renderable_list))
75
    if (display_buffer.overlay(renderable_list))
206
76
    {
76
    {
207
77
        report->renderables_in_frame(this, renderable_list);
77
        report->renderables_in_frame(this, renderable_list);
208
78
        renderer->suspend();
78
        renderer->suspend();
209
79
79
210
=== modified file 'src/server/compositor/screencast_display_buffer.cpp'
211
--- src/server/compositor/screencast_display_buffer.cpp	2016-07-28 09:10:43 +0000
212
+++ src/server/compositor/screencast_display_buffer.cpp	2016-09-19 09:16:51 +0000
213
@@ -153,7 +153,7 @@
214
153
    gl_context->release_current();
153
    gl_context->release_current();
215
154
}
154
}
216
155
155
218
156
bool mc::ScreencastDisplayBuffer::post_renderables_if_optimizable(mg::RenderableList const&)
156
bool mc::ScreencastDisplayBuffer::overlay(mg::RenderableList const&)
219
157
{
157
{
220
158
    return false;
158
    return false;
221
159
}
159
}
222
160
160
223
=== modified file 'src/server/compositor/screencast_display_buffer.h'
224
--- src/server/compositor/screencast_display_buffer.h	2016-07-28 09:10:43 +0000
225
+++ src/server/compositor/screencast_display_buffer.h	2016-09-19 09:16:51 +0000
226
@@ -108,7 +108,7 @@
227
108
108
228
109
    void release_current() override;
109
    void release_current() override;
229
110
110
231
111
    bool post_renderables_if_optimizable(graphics::RenderableList const&) override;
111
    bool overlay(graphics::RenderableList const&) override;
232
112
112
233
113
    void swap_buffers() override;
113
    void swap_buffers() override;
234
114
114
235
115
115
236
=== modified file 'src/server/graphics/nested/display_buffer.cpp'
237
--- src/server/graphics/nested/display_buffer.cpp	2016-08-25 13:34:29 +0000
238
+++ src/server/graphics/nested/display_buffer.cpp	2016-09-19 09:16:51 +0000
239
@@ -97,7 +97,7 @@
240
97
{
97
{
241
98
}
98
}
242
99
99
244
100
bool mgn::detail::DisplayBuffer::post_renderables_if_optimizable(RenderableList const&)
100
bool mgn::detail::DisplayBuffer::overlay(RenderableList const&)
245
101
{
101
{
246
102
    return false;
102
    return false;
247
103
}
103
}
248
104
104
249
=== modified file 'src/server/graphics/nested/display_buffer.h'
250
--- src/server/graphics/nested/display_buffer.h	2016-08-25 12:58:00 +0000
251
+++ src/server/graphics/nested/display_buffer.h	2016-09-19 09:16:51 +0000
252
@@ -58,7 +58,7 @@
253
58
    MirOrientation orientation() const override;
58
    MirOrientation orientation() const override;
254
59
    MirMirrorMode mirror_mode() const override;
59
    MirMirrorMode mirror_mode() const override;
255
60
60
257
61
    bool post_renderables_if_optimizable(RenderableList const& renderlist) override;
61
    bool overlay(RenderableList const& renderlist) override;
258
62
62
259
63
    NativeDisplayBuffer* native_display_buffer() override;
63
    NativeDisplayBuffer* native_display_buffer() override;
260
64
64
261
65
65
262
=== modified file 'tests/acceptance-tests/test_latency.cpp'
263
--- tests/acceptance-tests/test_latency.cpp	2016-08-26 16:52:19 +0000
264
+++ tests/acceptance-tests/test_latency.cpp	2016-09-19 09:16:51 +0000
265
@@ -129,7 +129,7 @@
266
129
        return {{0,0}, {1920, 1080}};
129
        return {{0,0}, {1920, 1080}};
267
130
    }
130
    }
268
131
131
270
132
    bool post_renderables_if_optimizable(mg::RenderableList const& renderables) override
132
    bool overlay(mg::RenderableList const& renderables) override
271
133
    {
133
    {
272
134
        //the surface will be the frontmost of the renderables
134
        //the surface will be the frontmost of the renderables
273
135
        if (!renderables.empty())
135
        if (!renderables.empty())
274
136
136
275
=== modified file 'tests/include/mir/test/doubles/mock_display_buffer.h'
276
--- tests/include/mir/test/doubles/mock_display_buffer.h	2016-05-03 06:55:25 +0000
277
+++ tests/include/mir/test/doubles/mock_display_buffer.h	2016-09-19 09:16:51 +0000
278
@@ -43,7 +43,7 @@
279
43
            .WillByDefault(Return(this));
43
            .WillByDefault(Return(this));
280
44
    }
44
    }
281
45
    MOCK_CONST_METHOD0(view_area, geometry::Rectangle());
45
    MOCK_CONST_METHOD0(view_area, geometry::Rectangle());
283
46
    MOCK_METHOD1(post_renderables_if_optimizable, bool(graphics::RenderableList const&));
46
    MOCK_METHOD1(overlay, bool(graphics::RenderableList const&));
284
47
    MOCK_CONST_METHOD0(orientation, MirOrientation());
47
    MOCK_CONST_METHOD0(orientation, MirOrientation());
285
48
    MOCK_CONST_METHOD0(mirror_mode, MirMirrorMode());
48
    MOCK_CONST_METHOD0(mirror_mode, MirMirrorMode());
286
49
    MOCK_METHOD0(native_display_buffer, graphics::NativeDisplayBuffer*());
49
    MOCK_METHOD0(native_display_buffer, graphics::NativeDisplayBuffer*());
287
50
50
288
=== modified file 'tests/mir_test_framework/headless_display_buffer_compositor_factory.cpp'
289
--- tests/mir_test_framework/headless_display_buffer_compositor_factory.cpp	2016-09-16 15:18:36 +0000
290
+++ tests/mir_test_framework/headless_display_buffer_compositor_factory.cpp	2016-09-19 09:16:51 +0000
291
@@ -72,7 +72,7 @@
292
72
        void composite(mir::compositor::SceneElementSequence&& seq) override
72
        void composite(mir::compositor::SceneElementSequence&& seq) override
293
73
        {
73
        {
294
74
            auto renderlist = filter(seq, db.view_area());
74
            auto renderlist = filter(seq, db.view_area());
296
75
            if (db.post_renderables_if_optimizable(renderlist))
75
            if (db.overlay(renderlist))
297
76
                return;
76
                return;
298
77
77
299
78
            // Invoke GL renderer specific functions if the DisplayBuffer supports them
78
            // Invoke GL renderer specific functions if the DisplayBuffer supports them
300
79
79
301
=== modified file 'tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp'
302
--- tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp	2016-08-01 14:43:19 +0000
303
+++ tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp	2016-09-19 09:16:51 +0000
304
@@ -104,7 +104,7 @@
305
104
            .WillByDefault(Return(mir_mirror_mode_none));
104
            .WillByDefault(Return(mir_mirror_mode_none));
306
105
        ON_CALL(display_buffer, view_area())
105
        ON_CALL(display_buffer, view_area())
307
106
            .WillByDefault(Return(screen));
106
            .WillByDefault(Return(screen));
309
107
        ON_CALL(display_buffer, post_renderables_if_optimizable(_))
107
        ON_CALL(display_buffer, overlay(_))
310
108
            .WillByDefault(Return(false));
108
            .WillByDefault(Return(false));
311
109
    }
109
    }
312
110
110
313
@@ -140,7 +140,7 @@
314
140
    Sequence seq;
140
    Sequence seq;
315
141
    EXPECT_CALL(*report, began_frame(_))
141
    EXPECT_CALL(*report, began_frame(_))
316
142
        .InSequence(seq);
142
        .InSequence(seq);
318
143
    EXPECT_CALL(display_buffer, post_renderables_if_optimizable(_))
143
    EXPECT_CALL(display_buffer, overlay(_))
319
144
        .InSequence(seq)
144
        .InSequence(seq)
320
145
        .WillOnce(Return(true));
145
        .WillOnce(Return(true));
321
146
    EXPECT_CALL(*report, renderables_in_frame(_,_))
146
    EXPECT_CALL(*report, renderables_in_frame(_,_))
322
@@ -170,7 +170,7 @@
323
170
    Sequence seq;
170
    Sequence seq;
324
171
    EXPECT_CALL(*report, began_frame(_))
171
    EXPECT_CALL(*report, began_frame(_))
325
172
        .InSequence(seq);
172
        .InSequence(seq);
327
173
    EXPECT_CALL(display_buffer, post_renderables_if_optimizable(_))
173
    EXPECT_CALL(display_buffer, overlay(_))
328
174
        .InSequence(seq)
174
        .InSequence(seq)
329
175
        .WillOnce(Return(false));
175
        .WillOnce(Return(false));
330
176
    EXPECT_CALL(*report, renderables_in_frame(_,_))
176
    EXPECT_CALL(*report, renderables_in_frame(_,_))
331
@@ -227,7 +227,7 @@
332
227
            .WillByDefault(Return(mir_mirror_mode_none));
227
            .WillByDefault(Return(mir_mirror_mode_none));
333
228
228
334
229
    Sequence seq;
229
    Sequence seq;
336
230
    EXPECT_CALL(display_buffer, post_renderables_if_optimizable(_))
230
    EXPECT_CALL(display_buffer, overlay(_))
337
231
        .InSequence(seq)
231
        .InSequence(seq)
338
232
        .WillOnce(Return(false));
232
        .WillOnce(Return(false));
339
233
233
340
@@ -238,12 +238,12 @@
341
238
    EXPECT_CALL(mock_renderer, render(IsEmpty()))
238
    EXPECT_CALL(mock_renderer, render(IsEmpty()))
342
239
        .InSequence(seq);
239
        .InSequence(seq);
343
240
240
345
241
    EXPECT_CALL(display_buffer, post_renderables_if_optimizable(_))
241
    EXPECT_CALL(display_buffer, overlay(_))
346
242
        .InSequence(seq)
242
        .InSequence(seq)
347
243
        .WillOnce(Return(true));
243
        .WillOnce(Return(true));
348
244
    //we should be testing that post_buffer is called, not just that
244
    //we should be testing that post_buffer is called, not just that
349
245
    //we check the bits on the compositor buffer
245
    //we check the bits on the compositor buffer
351
246
    EXPECT_CALL(display_buffer, post_renderables_if_optimizable(_))
246
    EXPECT_CALL(display_buffer, overlay(_))
352
247
        .InSequence(seq)
247
        .InSequence(seq)
353
248
        .WillOnce(Return(false));
248
        .WillOnce(Return(false));
354
249
    EXPECT_CALL(display_buffer, orientation())
249
    EXPECT_CALL(display_buffer, orientation())
355
@@ -274,7 +274,7 @@
356
274
        .WillOnce(Return(mir_orientation_normal));
274
        .WillOnce(Return(mir_orientation_normal));
357
275
    EXPECT_CALL(display_buffer, mirror_mode())
275
    EXPECT_CALL(display_buffer, mirror_mode())
358
276
        .WillOnce(Return(mir_mirror_mode_none));
276
        .WillOnce(Return(mir_mirror_mode_none));
360
277
    EXPECT_CALL(display_buffer, post_renderables_if_optimizable(_))
277
    EXPECT_CALL(display_buffer, overlay(_))
361
278
        .WillRepeatedly(Return(false));
278
        .WillRepeatedly(Return(false));
362
279
279
363
280
    auto window0 = std::make_shared<mtd::FakeRenderable>(geom::Rectangle{{99,99},{2,2}});
280
    auto window0 = std::make_shared<mtd::FakeRenderable>(geom::Rectangle{{99,99},{2,2}});
364
281
281
365
=== modified file 'tests/unit-tests/compositor/test_screencast_display_buffer.cpp'
366
--- tests/unit-tests/compositor/test_screencast_display_buffer.cpp	2016-04-22 02:39:57 +0000
367
+++ tests/unit-tests/compositor/test_screencast_display_buffer.cpp	2016-09-19 09:16:51 +0000
368
@@ -169,7 +169,7 @@
369
169
                                   default_mirror_mode, free_queue,
169
                                   default_mirror_mode, free_queue,
370
170
                                   ready_queue, stub_display};
170
                                   ready_queue, stub_display};
371
171
171
373
172
    EXPECT_FALSE(db.post_renderables_if_optimizable(renderables));
172
    EXPECT_FALSE(db.overlay(renderables));
374
173
}
173
}
375
174
174
376
175
TEST_F(ScreencastDisplayBufferTest, does_not_throw_on_multiple_make_current_calls)
175
TEST_F(ScreencastDisplayBufferTest, does_not_throw_on_multiple_make_current_calls)
377
176
176
378
=== modified file 'tests/unit-tests/platforms/android/server/test_display.cpp'
379
--- tests/unit-tests/platforms/android/server/test_display.cpp	2016-08-24 02:09:08 +0000
380
+++ tests/unit-tests/platforms/android/server/test_display.cpp	2016-09-19 09:16:51 +0000
381
@@ -1033,7 +1033,7 @@
382
1033
1033
383
1034
    display.for_each_display_sync_group([](mg::DisplaySyncGroup& group) {
1034
    display.for_each_display_sync_group([](mg::DisplaySyncGroup& group) {
384
1035
        group.for_each_display_buffer([](mg::DisplayBuffer& db) {
1035
        group.for_each_display_buffer([](mg::DisplayBuffer& db) {
386
1036
            EXPECT_FALSE(db.post_renderables_if_optimizable({std::make_shared<mtd::StubRenderable>()}));
1036
            EXPECT_FALSE(db.overlay({std::make_shared<mtd::StubRenderable>()}));
387
1037
        });
1037
        });
388
1038
    });
1038
    });
389
1039
}
1039
}
390
1040
1040
391
=== modified file 'tests/unit-tests/platforms/android/server/test_display_buffer.cpp'
392
--- tests/unit-tests/platforms/android/server/test_display_buffer.cpp	2016-08-24 02:09:08 +0000
393
+++ tests/unit-tests/platforms/android/server/test_display_buffer.cpp	2016-09-19 09:16:51 +0000
394
@@ -105,8 +105,8 @@
395
105
        .WillOnce(Return(true))
105
        .WillOnce(Return(true))
396
106
        .WillOnce(Return(false));
106
        .WillOnce(Return(false));
397
107
107
400
108
    EXPECT_TRUE(db.post_renderables_if_optimizable(renderlist)); 
108
    EXPECT_TRUE(db.overlay(renderlist)); 
401
109
    EXPECT_FALSE(db.post_renderables_if_optimizable(renderlist)); 
109
    EXPECT_FALSE(db.overlay(renderlist)); 
402
110
}
110
}
403
111
111
404
112
TEST_F(DisplayBuffer, defaults_to_normal_orientation)
112
TEST_F(DisplayBuffer, defaults_to_normal_orientation)
405
@@ -287,7 +287,7 @@
406
287
        top_left,
287
        top_left,
407
288
        mga::OverlayOptimization::disabled);
288
        mga::OverlayOptimization::disabled);
408
289
289
410
290
    EXPECT_FALSE(db.post_renderables_if_optimizable(renderlist)); 
290
    EXPECT_FALSE(db.overlay(renderlist)); 
411
291
}
291
}
412
292
292
413
293
TEST_F(DisplayBuffer, rejects_commit_if_list_doesnt_need_commit)
293
TEST_F(DisplayBuffer, rejects_commit_if_list_doesnt_need_commit)
414
@@ -313,19 +313,19 @@
415
313
    };
313
    };
416
314
314
417
315
    mg::RenderableList renderlist{buffer1, buffer2};
315
    mg::RenderableList renderlist{buffer1, buffer2};
419
316
    EXPECT_TRUE(db.post_renderables_if_optimizable(renderlist));
316
    EXPECT_TRUE(db.overlay(renderlist));
420
317
    set_to_overlays(db.contents().list);
317
    set_to_overlays(db.contents().list);
422
318
    EXPECT_FALSE(db.post_renderables_if_optimizable(renderlist)); 
318
    EXPECT_FALSE(db.overlay(renderlist)); 
423
319
319
424
320
    renderlist = mg::RenderableList{buffer2, buffer1}; //ordering changed
320
    renderlist = mg::RenderableList{buffer2, buffer1}; //ordering changed
426
321
    EXPECT_TRUE(db.post_renderables_if_optimizable(renderlist)); 
321
    EXPECT_TRUE(db.overlay(renderlist)); 
427
322
    set_to_overlays(db.contents().list);
322
    set_to_overlays(db.contents().list);
429
323
    EXPECT_FALSE(db.post_renderables_if_optimizable(renderlist)); 
323
    EXPECT_FALSE(db.overlay(renderlist)); 
430
324
324
431
325
    renderlist = mg::RenderableList{buffer3, buffer1}; //buffer changed
325
    renderlist = mg::RenderableList{buffer3, buffer1}; //buffer changed
433
326
    EXPECT_TRUE(db.post_renderables_if_optimizable(renderlist)); 
326
    EXPECT_TRUE(db.overlay(renderlist)); 
434
327
    set_to_overlays(db.contents().list);
327
    set_to_overlays(db.contents().list);
436
328
    EXPECT_FALSE(db.post_renderables_if_optimizable(renderlist)); 
328
    EXPECT_FALSE(db.overlay(renderlist)); 
437
329
}
329
}
438
330
330
439
331
TEST_F(DisplayBuffer, reports_position_correctly)
331
TEST_F(DisplayBuffer, reports_position_correctly)
440
@@ -351,7 +351,7 @@
441
351
            std::make_shared<mtd::StubBuffer>(std::make_shared<mtd::StubAndroidNativeBuffer>()))};
351
            std::make_shared<mtd::StubBuffer>(std::make_shared<mtd::StubAndroidNativeBuffer>()))};
442
352
352
443
353
    db.configure(mir_power_mode_on, mir_orientation_inverted, geom::Displacement{0,0});
353
    db.configure(mir_power_mode_on, mir_orientation_inverted, geom::Displacement{0,0});
445
354
    EXPECT_FALSE(db.post_renderables_if_optimizable(renderlist));
354
    EXPECT_FALSE(db.overlay(renderlist));
446
355
    db.configure(mir_power_mode_on, mir_orientation_normal, geom::Displacement{0,0});
355
    db.configure(mir_power_mode_on, mir_orientation_normal, geom::Displacement{0,0});
448
356
    EXPECT_TRUE(db.post_renderables_if_optimizable(renderlist));
356
    EXPECT_TRUE(db.overlay(renderlist));
449
357
}
357
}
450
358
358
451
=== modified file 'tests/unit-tests/platforms/android/server/test_display_group.cpp'
452
--- tests/unit-tests/platforms/android/server/test_display_group.cpp	2016-08-24 02:09:08 +0000
453
+++ tests/unit-tests/platforms/android/server/test_display_group.cpp	2016-09-19 09:16:51 +0000
454
@@ -35,7 +35,7 @@
455
35
struct StubConfigurableDB : mga::ConfigurableDisplayBuffer, mg::NativeDisplayBuffer
35
struct StubConfigurableDB : mga::ConfigurableDisplayBuffer, mg::NativeDisplayBuffer
456
36
{
36
{
457
37
    mir::geometry::Rectangle view_area() const override { return {}; }
37
    mir::geometry::Rectangle view_area() const override { return {}; }
459
38
    bool post_renderables_if_optimizable(mg::RenderableList const&) override { return false; }
38
    bool overlay(mg::RenderableList const&) override { return false; }
460
39
    MirOrientation orientation() const override { return mir_orientation_normal; }
39
    MirOrientation orientation() const override { return mir_orientation_normal; }
461
40
    MirMirrorMode mirror_mode() const override { return mir_mirror_mode_none; }
40
    MirMirrorMode mirror_mode() const override { return mir_mirror_mode_none; }
462
41
    mg::NativeDisplayBuffer* native_display_buffer() override { return this; }
41
    mg::NativeDisplayBuffer* native_display_buffer() override { return this; }
463
42
42
464
=== modified file 'tests/unit-tests/platforms/mesa/kms/test_display_buffer.cpp'
465
--- tests/unit-tests/platforms/mesa/kms/test_display_buffer.cpp	2016-09-16 15:18:36 +0000
466
+++ tests/unit-tests/platforms/mesa/kms/test_display_buffer.cpp	2016-09-19 09:16:51 +0000
467
@@ -164,7 +164,7 @@
468
164
164
469
165
    auto original_count = mock_bypassable_buffer.use_count();
165
    auto original_count = mock_bypassable_buffer.use_count();
470
166
166
472
167
    EXPECT_TRUE(db.post_renderables_if_optimizable(bypassable_list));
167
    EXPECT_TRUE(db.overlay(bypassable_list));
473
168
    EXPECT_EQ(original_count+1, mock_bypassable_buffer.use_count());
168
    EXPECT_EQ(original_count+1, mock_bypassable_buffer.use_count());
474
169
169
475
170
    // Switch back to normal compositing
170
    // Switch back to normal compositing
476
@@ -192,7 +192,7 @@
477
192
192
478
193
    for (int frame = 0; frame < 5; ++frame)
193
    for (int frame = 0; frame < 5; ++frame)
479
194
    {
194
    {
481
195
        ASSERT_TRUE(db.post_renderables_if_optimizable(bypassable_list));
195
        ASSERT_TRUE(db.overlay(bypassable_list));
482
196
        db.post();
196
        db.post();
483
197
197
484
198
        // Cast to a simple int type so that test failures are readable
198
        // Cast to a simple int type so that test failures are readable
485
@@ -222,7 +222,7 @@
486
222
222
487
223
    for (int frame = 0; frame < 5; ++frame)
223
    for (int frame = 0; frame < 5; ++frame)
488
224
    {
224
    {
490
225
        ASSERT_FALSE(db.post_renderables_if_optimizable(non_bypassable_list));
225
        ASSERT_FALSE(db.overlay(non_bypassable_list));
491
226
        db.post();
226
        db.post();
492
227
227
493
228
        // Cast to a simple int type so that test failures are readable
228
        // Cast to a simple int type so that test failures are readable
494
@@ -246,7 +246,7 @@
495
246
246
496
247
    auto original_count = mock_bypassable_buffer.use_count();
247
    auto original_count = mock_bypassable_buffer.use_count();
497
248
248
499
249
    EXPECT_TRUE(db.post_renderables_if_optimizable(bypassable_list));
249
    EXPECT_TRUE(db.overlay(bypassable_list));
500
250
    EXPECT_EQ(original_count+1, mock_bypassable_buffer.use_count());
250
    EXPECT_EQ(original_count+1, mock_bypassable_buffer.use_count());
501
251
251
502
252
    db.post();
252
    db.post();
503
@@ -269,7 +269,7 @@
504
269
        gl_config,
269
        gl_config,
505
270
        mock_egl.fake_egl_context);
270
        mock_egl.fake_egl_context);
506
271
271
508
272
    EXPECT_TRUE(db.post_renderables_if_optimizable(bypassable_list));
272
    EXPECT_TRUE(db.overlay(bypassable_list));
509
273
}
273
}
510
274
274
511
275
TEST_F(MesaDisplayBufferTest, failed_bypass_falls_back_gracefully)
275
TEST_F(MesaDisplayBufferTest, failed_bypass_falls_back_gracefully)
512
@@ -291,9 +291,9 @@
513
291
        gl_config,
291
        gl_config,
514
292
        mock_egl.fake_egl_context);
292
        mock_egl.fake_egl_context);
515
293
293
517
294
    EXPECT_FALSE(db.post_renderables_if_optimizable(bypassable_list));
294
    EXPECT_FALSE(db.overlay(bypassable_list));
518
295
    // And then we recover. DRM finds enough resources to AddFB ...
295
    // And then we recover. DRM finds enough resources to AddFB ...
520
296
    EXPECT_TRUE(db.post_renderables_if_optimizable(bypassable_list));
296
    EXPECT_TRUE(db.overlay(bypassable_list));
521
297
}
297
}
522
298
298
523
299
TEST_F(MesaDisplayBufferTest, skips_bypass_because_of_lagging_resize)
299
TEST_F(MesaDisplayBufferTest, skips_bypass_because_of_lagging_resize)
524
@@ -320,7 +320,7 @@
525
320
        gl_config,
320
        gl_config,
526
321
        mock_egl.fake_egl_context);
321
        mock_egl.fake_egl_context);
527
322
322
529
323
    EXPECT_FALSE(db.post_renderables_if_optimizable(list));
323
    EXPECT_FALSE(db.overlay(list));
530
324
}
324
}
531
325
325
532
326
TEST_F(MesaDisplayBufferTest, rotated_cannot_bypass)
326
TEST_F(MesaDisplayBufferTest, rotated_cannot_bypass)
533
@@ -337,7 +337,7 @@
534
337
        gl_config,
337
        gl_config,
535
338
        mock_egl.fake_egl_context);
338
        mock_egl.fake_egl_context);
536
339
339
538
340
    EXPECT_FALSE(db.post_renderables_if_optimizable(bypassable_list));
340
    EXPECT_FALSE(db.overlay(bypassable_list));
539
341
}
341
}
540
342
342
541
343
TEST_F(MesaDisplayBufferTest, fullscreen_software_buffer_cannot_bypass)
343
TEST_F(MesaDisplayBufferTest, fullscreen_software_buffer_cannot_bypass)
542
@@ -359,7 +359,7 @@
543
359
        gl_config,
359
        gl_config,
544
360
        mock_egl.fake_egl_context);
360
        mock_egl.fake_egl_context);
545
361
361
547
362
    EXPECT_FALSE(db.post_renderables_if_optimizable(list));
362
    EXPECT_FALSE(db.overlay(list));
548
363
}
363
}
549
364
364
550
365
TEST_F(MesaDisplayBufferTest, fullscreen_software_buffer_not_used_as_gbm_bo)
365
TEST_F(MesaDisplayBufferTest, fullscreen_software_buffer_not_used_as_gbm_bo)
551
@@ -384,7 +384,7 @@
552
384
    // If you find yourself using gbm_ functions on a Shm buffer then you're
384
    // If you find yourself using gbm_ functions on a Shm buffer then you're
553
385
    // asking for a crash (LP: #1493721) ...
385
    // asking for a crash (LP: #1493721) ...
554
386
    EXPECT_CALL(mock_gbm, gbm_bo_get_user_data(_)).Times(0);
386
    EXPECT_CALL(mock_gbm, gbm_bo_get_user_data(_)).Times(0);
556
387
    db.post_renderables_if_optimizable(list);
387
    db.overlay(list);
557
388
}
388
}
558
389
389
559
390
TEST_F(MesaDisplayBufferTest, orientation_not_implemented_internally)
390
TEST_F(MesaDisplayBufferTest, orientation_not_implemented_internally)
560
@@ -585,7 +585,7 @@
561
585
        gl_config,
585
        gl_config,
562
586
        mock_egl.fake_egl_context);
586
        mock_egl.fake_egl_context);
563
587
587
565
588
    EXPECT_FALSE(db.post_renderables_if_optimizable(list));
588
    EXPECT_FALSE(db.overlay(list));
566
589
}
589
}
567
590
590
568
591
TEST_F(MesaDisplayBufferTest, skips_bypass_because_of_incompatible_bypass_buffer)
591
TEST_F(MesaDisplayBufferTest, skips_bypass_because_of_incompatible_bypass_buffer)
569
@@ -614,6 +614,6 @@
570
614
        gl_config,
614
        gl_config,
571
615
        mock_egl.fake_egl_context);
615
        mock_egl.fake_egl_context);
572
616
616
574
617
    EXPECT_FALSE(db.post_renderables_if_optimizable(list));
617
    EXPECT_FALSE(db.overlay(list));
575
618
}
618
}
576
619
619
Status:	Merged
Merged at revision:	3710
Proposed branch:	lp:~vanvugt/mir/overlay-terminology-is-awkward
Merge into:	lp:mir
Diff against target:	575 lines (+61/-63) 28 files modified examples/server_example_adorning_compositor.cpp (+1/-1) include/platform/mir/graphics/display_buffer.h (+6/-8) include/test/mir/test/doubles/null_display_buffer.h (+1/-1) playground/demo-shell/demo_compositor.cpp (+1/-1) src/platform/symbols.map (+1/-1) src/platforms/android/server/display_buffer.cpp (+1/-1) src/platforms/android/server/display_buffer.h (+1/-1) src/platforms/android/utils/render_overlays.cpp (+1/-1) src/platforms/android/utils/test_android_hardware_sanity.cpp (+1/-1) src/platforms/eglstream-kms/server/display.cpp (+1/-1) src/platforms/mesa/server/kms/display_buffer.cpp (+1/-1) src/platforms/mesa/server/kms/display_buffer.h (+1/-1) src/platforms/mesa/server/x11/graphics/display_buffer.cpp (+1/-1) src/platforms/mesa/server/x11/graphics/display_buffer.h (+1/-1) src/server/compositor/default_display_buffer_compositor.cpp (+1/-1) src/server/compositor/screencast_display_buffer.cpp (+1/-1) src/server/compositor/screencast_display_buffer.h (+1/-1) src/server/graphics/nested/display_buffer.cpp (+1/-1) src/server/graphics/nested/display_buffer.h (+1/-1) tests/acceptance-tests/test_latency.cpp (+1/-1) tests/include/mir/test/doubles/mock_display_buffer.h (+1/-1) tests/mir_test_framework/headless_display_buffer_compositor_factory.cpp (+1/-1) tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp (+7/-7) tests/unit-tests/compositor/test_screencast_display_buffer.cpp (+1/-1) tests/unit-tests/platforms/android/server/test_display.cpp (+1/-1) tests/unit-tests/platforms/android/server/test_display_buffer.cpp (+11/-11) tests/unit-tests/platforms/android/server/test_display_group.cpp (+1/-1) tests/unit-tests/platforms/mesa/kms/test_display_buffer.cpp (+13/-13)
To merge this branch:	bzr merge lp:~vanvugt/mir/overlay-terminology-is-awkward
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Needs Fixing on 2016-09-19
Cemil Azizoglu (community)			Approve on 2016-09-19
Kevin DuBois (community)		2016-09-16	Approve on 2016-09-19
Review via email: mp+305916@code.launchpad.net