1
=== modified file 'examples/CMakeLists.txt'
2
--- examples/CMakeLists.txt	2015-08-12 09:52:57 +0000
3
+++ examples/CMakeLists.txt	2015-09-04 06:51:35 +0000
4
@@ -3,6 +3,7 @@
5
3
  buffer_render_target.cpp
3
  buffer_render_target.cpp
6
4
  image_renderer.cpp
4
  image_renderer.cpp
7
5
)
5
)
8
6
9
6
target_link_libraries(mir_demo_standalone_render_surfaces
7
target_link_libraries(mir_demo_standalone_render_surfaces
10
7
  mirserver
8
  mirserver
11
8
  exampleserverconfig
9
  exampleserverconfig
12
@@ -168,6 +169,7 @@
13
168
  ${PROJECT_SOURCE_DIR}/include/server
169
  ${PROJECT_SOURCE_DIR}/include/server
14
169
  ${PROJECT_SOURCE_DIR}/include/client
170
  ${PROJECT_SOURCE_DIR}/include/client
15
170
  ${PROJECT_SOURCE_DIR}/include/platform
171
  ${PROJECT_SOURCE_DIR}/include/platform
16
172
  ${PROJECT_SOURCE_DIR}/src/renderers/gl/include
17
171
  ${GLESv2_INCLUDE_DIRS}
173
  ${GLESv2_INCLUDE_DIRS}
18
172
)
174
)
19
173
175
20
174
176
21
=== modified file 'examples/buffer_render_target.cpp'
22
--- examples/buffer_render_target.cpp	2015-02-22 07:46:25 +0000
23
+++ examples/buffer_render_target.cpp	2015-09-04 06:51:35 +0000
24
@@ -18,6 +18,7 @@
25
18
18
26
19
#include "buffer_render_target.h"
19
#include "buffer_render_target.h"
27
20
#include "mir/graphics/buffer.h"
20
#include "mir/graphics/buffer.h"
28
21
#include "mir/renderer/gl/texture_source.h"
29
21
22
30
22
#include <GLES2/gl2ext.h>
23
#include <GLES2/gl2ext.h>
31
23
#include <stdexcept>
24
#include <stdexcept>
32
@@ -71,13 +72,18 @@
33
71
72
34
72
    if (fbo == 0)
73
    if (fbo == 0)
35
73
    {
74
    {
36
75
        auto const texture_source =
37
76
            dynamic_cast<mir::renderer::gl::TextureSource*>(buffer.native_buffer_base());
38
77
        if (!texture_source)
39
78
            throw std::logic_error("Buffer does not support GL rendering");
40
79
41
74
        glGenFramebuffers(1, &fbo);
80
        glGenFramebuffers(1, &fbo);
42
75
        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
81
        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
43
76
82
44
77
        /* Set up color buffer... */
83
        /* Set up color buffer... */
45
78
        glGenTextures(1, &color_tex);
84
        glGenTextures(1, &color_tex);
46
79
        glBindTexture(GL_TEXTURE_2D, color_tex);
85
        glBindTexture(GL_TEXTURE_2D, color_tex);
48
80
        buffer.gl_bind_to_texture();
86
        texture_source->gl_bind_to_texture();
49
81
        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
87
        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
50
82
                               GL_TEXTURE_2D, color_tex, 0);
88
                               GL_TEXTURE_2D, color_tex, 0);
51
83
89
52
84
90
53
=== modified file 'examples/server_example_adorning_compositor.cpp'
54
--- examples/server_example_adorning_compositor.cpp	2015-04-07 13:19:22 +0000
55
+++ examples/server_example_adorning_compositor.cpp	2015-09-04 06:51:35 +0000
56
@@ -20,6 +20,11 @@
57
20
#include "mir/graphics/display_buffer.h"
20
#include "mir/graphics/display_buffer.h"
58
21
#include "mir/graphics/buffer.h"
21
#include "mir/graphics/buffer.h"
59
22
#include "mir/compositor/scene_element.h"
22
#include "mir/compositor/scene_element.h"
60
23
#include "mir/renderer/gl/texture_source.h"
61
24
62
25
#include <stdexcept>
63
26
#include <boost/throw_exception.hpp>
64
27
65
23
#include <GLES2/gl2.h>
28
#include <GLES2/gl2.h>
66
24
29
67
25
namespace me = mir::examples;
30
namespace me = mir::examples;
68
@@ -150,7 +155,13 @@
69
150
155
70
151
        glActiveTexture(GL_TEXTURE0);
156
        glActiveTexture(GL_TEXTURE0);
71
152
        glBindTexture(GL_TEXTURE_2D, texture);
157
        glBindTexture(GL_TEXTURE_2D, texture);
73
153
        renderable->buffer()->gl_bind_to_texture();
158
74
159
        auto const texture_source =
75
160
            dynamic_cast<mir::renderer::gl::TextureSource*>(
76
161
                renderable->buffer()->native_buffer_base());
77
162
        if (!texture_source)
78
163
            BOOST_THROW_EXCEPTION(std::logic_error("Buffer does not support GL rendering"));
79
164
        texture_source->gl_bind_to_texture();
80
154
165
81
155
        glEnableVertexAttribArray(vPositionAttr);
166
        glEnableVertexAttribArray(vPositionAttr);
82
156
        glEnableVertexAttribArray(uvCoord);
167
        glEnableVertexAttribArray(uvCoord);
83
157
168
84
=== modified file 'include/platform/mir/graphics/buffer.h'
85
--- include/platform/mir/graphics/buffer.h	2015-08-27 13:41:02 +0000
86
+++ include/platform/mir/graphics/buffer.h	2015-09-04 06:51:35 +0000
87
@@ -51,7 +51,6 @@
88
51
    virtual geometry::Size size() const = 0;
51
    virtual geometry::Size size() const = 0;
89
52
    virtual geometry::Stride stride() const = 0;
52
    virtual geometry::Stride stride() const = 0;
90
53
    virtual MirPixelFormat pixel_format() const = 0;
53
    virtual MirPixelFormat pixel_format() const = 0;
91
54
    virtual void gl_bind_to_texture() = 0;
92
55
    //FIXME: correct mg::Buffer::write, it requires that the user does too much to use it correctly,
54
    //FIXME: correct mg::Buffer::write, it requires that the user does too much to use it correctly,
93
56
    //       (ie, it forces them to figure out what size is proper, alloc a buffer, fill it, and then
55
    //       (ie, it forces them to figure out what size is proper, alloc a buffer, fill it, and then
94
57
    //       copy the data into the buffer)
56
    //       copy the data into the buffer)
95
58
57
96
=== modified file 'src/platform/symbols.map'
97
--- src/platform/symbols.map	2015-09-04 06:51:35 +0000
98
+++ src/platform/symbols.map	2015-09-04 06:51:35 +0000
99
@@ -5,7 +5,6 @@
100
5
# ../tools/process_doxygen_xml.py doc/xml/*.xml | grep "^mirplatform public" | sed "s/mirplatform public: /    /" | sort  
5
# ../tools/process_doxygen_xml.py doc/xml/*.xml | grep "^mirplatform public" | sed "s/mirplatform public: /    /" | sort  
101
6
    mir::graphics::BufferBasic::BufferBasic*;
6
    mir::graphics::BufferBasic::BufferBasic*;
102
7
    mir::graphics::Buffer::Buffer*;
7
    mir::graphics::Buffer::Buffer*;
103
8
    mir::graphics::Buffer::gl_bind_to_texture*;
104
9
    mir::graphics::Buffer::id*;
8
    mir::graphics::Buffer::id*;
105
10
    mir::graphics::Buffer::native_buffer_base*;
9
    mir::graphics::Buffer::native_buffer_base*;
106
11
    mir::graphics::Buffer::native_buffer_handle*;
10
    mir::graphics::Buffer::native_buffer_handle*;
107
12
11
108
=== modified file 'src/platforms/CMakeLists.txt'
109
--- src/platforms/CMakeLists.txt	2015-09-04 06:51:35 +0000
110
+++ src/platforms/CMakeLists.txt	2015-09-04 06:51:35 +0000
111
@@ -27,6 +27,7 @@
112
27
27
113
28
set(server_common_include_dirs
28
set(server_common_include_dirs
114
29
  ${PROJECT_SOURCE_DIR}/include/platform
29
  ${PROJECT_SOURCE_DIR}/include/platform
115
30
  ${PROJECT_SOURCE_DIR}/src/renderers/gl/include
116
30
)
31
)
117
31
32
118
32
# TODO platform implementations shouldn't depend on private APIs
33
# TODO platform implementations shouldn't depend on private APIs
119
33
34
120
=== modified file 'src/platforms/android/server/buffer.h'
121
--- src/platforms/android/server/buffer.h	2015-08-27 13:41:02 +0000
122
+++ src/platforms/android/server/buffer.h	2015-09-04 06:51:35 +0000
123
@@ -21,6 +21,7 @@
124
21
#define MIR_GRAPHICS_ANDROID_BUFFER_H_
21
#define MIR_GRAPHICS_ANDROID_BUFFER_H_
125
22
22
126
23
#include "mir/graphics/buffer_basic.h"
23
#include "mir/graphics/buffer_basic.h"
127
24
#include "mir/renderer/gl/texture_source.h"
128
24
#include "buffer_usage.h"
25
#include "buffer_usage.h"
129
25
26
130
26
#include <hardware/gralloc.h>
27
#include <hardware/gralloc.h>
131
@@ -42,7 +43,8 @@
132
42
namespace android
43
namespace android
133
43
{
44
{
134
44
45
136
45
class Buffer: public BufferBasic, public NativeBufferBase
46
class Buffer: public BufferBasic, public NativeBufferBase,
137
47
              public renderer::gl::TextureSource
138
46
{
48
{
139
47
public:
49
public:
140
48
    Buffer(gralloc_module_t const* hw_module,
50
    Buffer(gralloc_module_t const* hw_module,
141
49
51
142
=== modified file 'src/platforms/mesa/server/common/gbm_buffer.h'
143
--- src/platforms/mesa/server/common/gbm_buffer.h	2015-08-27 13:41:02 +0000
144
+++ src/platforms/mesa/server/common/gbm_buffer.h	2015-09-04 06:51:35 +0000
145
@@ -21,6 +21,7 @@
146
21
#define MIR_GRAPHICS_MESA_GBM_BUFFER_H_
21
#define MIR_GRAPHICS_MESA_GBM_BUFFER_H_
147
22
22
148
23
#include "mir/graphics/buffer_basic.h"
23
#include "mir/graphics/buffer_basic.h"
149
24
#include "mir/renderer/gl/texture_source.h"
150
24
25
151
25
#include <gbm.h>
26
#include <gbm.h>
152
26
27
153
@@ -45,7 +46,8 @@
154
45
46
155
46
class BufferTextureBinder;
47
class BufferTextureBinder;
156
47
48
158
48
class GBMBuffer: public BufferBasic, public NativeBufferBase
49
class GBMBuffer: public BufferBasic, public NativeBufferBase,
159
50
                 public renderer::gl::TextureSource
160
49
{
51
{
161
50
public:
52
public:
162
51
    GBMBuffer(std::shared_ptr<gbm_bo> const& handle,
53
    GBMBuffer(std::shared_ptr<gbm_bo> const& handle,
163
52
54
164
=== modified file 'src/platforms/mesa/server/common/shm_buffer.h'
165
--- src/platforms/mesa/server/common/shm_buffer.h	2015-08-27 13:41:02 +0000
166
+++ src/platforms/mesa/server/common/shm_buffer.h	2015-09-04 06:51:35 +0000
167
@@ -24,6 +24,7 @@
168
24
#include "mir/geometry/dimensions.h"
24
#include "mir/geometry/dimensions.h"
169
25
#include "mir/geometry/size.h"
25
#include "mir/geometry/size.h"
170
26
#include "mir_toolkit/common.h"
26
#include "mir_toolkit/common.h"
171
27
#include "mir/renderer/gl/texture_source.h"
172
27
28
173
28
namespace mir
29
namespace mir
174
29
{
30
{
175
@@ -34,7 +35,8 @@
176
34
35
177
35
class ShmFile;
36
class ShmFile;
178
36
37
180
37
class ShmBuffer : public BufferBasic, public NativeBufferBase
38
class ShmBuffer : public BufferBasic, public NativeBufferBase,
181
39
                  public renderer::gl::TextureSource
182
38
{
40
{
183
39
public:
41
public:
184
40
    static bool supports(MirPixelFormat);
42
    static bool supports(MirPixelFormat);
185
41
43
186
=== added directory 'src/renderers'
187
=== added directory 'src/renderers/gl'
188
=== added directory 'src/renderers/gl/include'
189
=== added directory 'src/renderers/gl/include/mir'
190
=== added directory 'src/renderers/gl/include/mir/renderer'
191
=== added directory 'src/renderers/gl/include/mir/renderer/gl'
192
=== added file 'src/renderers/gl/include/mir/renderer/gl/texture_source.h'
193
--- src/renderers/gl/include/mir/renderer/gl/texture_source.h	1970-01-01 00:00:00 +0000
194
+++ src/renderers/gl/include/mir/renderer/gl/texture_source.h	2015-09-04 06:51:35 +0000
195
@@ -0,0 +1,46 @@
196
1
/*
197
2
 * Copyright © 2015 Canonical Ltd.
198
3
 *
199
4
 * This program is free software: you can redistribute it and/or modify it
200
5
 * under the terms of the GNU Lesser General Public License version 3,
201
6
 * as published by the Free Software Foundation.
202
7
 *
203
8
 * This program is distributed in the hope that it will be useful,
204
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
205
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
206
11
 * GNU Lesser General Public License for more details.
207
12
 *
208
13
 * You should have received a copy of the GNU Lesser General Public License
209
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
210
15
 *
211
16
 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
212
17
 */
213
18
214
19
#ifndef MIR_RENDERER_GL_TEXTURE_SOURCE_H_
215
20
#define MIR_RENDERER_GL_TEXTURE_SOURCE_H_
216
21
217
22
namespace mir
218
23
{
219
24
namespace renderer
220
25
{
221
26
namespace gl
222
27
{
223
28
224
29
class TextureSource
225
30
{
226
31
public:
227
32
    virtual ~TextureSource() = default;
228
33
229
34
    virtual void gl_bind_to_texture() = 0;
230
35
231
36
protected:
232
37
    TextureSource() = default;
233
38
    TextureSource(TextureSource const&) = delete;
234
39
    TextureSource& operator=(TextureSource const&) = delete;
235
40
};
236
41
237
42
}
238
43
}
239
44
}
240
45
241
46
#endif
242
0
47
243
=== modified file 'src/server/compositor/CMakeLists.txt'
244
--- src/server/compositor/CMakeLists.txt	2015-08-10 07:14:58 +0000
245
+++ src/server/compositor/CMakeLists.txt	2015-09-04 06:51:35 +0000
246
@@ -1,3 +1,7 @@
247
1
include_directories(
248
2
  ${PROJECT_SOURCE_DIR}/src/renderers/gl/include
249
3
)
250
4
251
1
set(
5
set(
252
2
  MIR_COMPOSITOR_SRCS
6
  MIR_COMPOSITOR_SRCS
253
3
7
254
4
8
255
=== modified file 'src/server/compositor/recently_used_cache.cpp'
256
--- src/server/compositor/recently_used_cache.cpp	2015-06-17 05:20:42 +0000
257
+++ src/server/compositor/recently_used_cache.cpp	2015-09-04 06:51:35 +0000
258
@@ -19,6 +19,10 @@
259
19
19
260
20
#include "mir/compositor/recently_used_cache.h"
20
#include "mir/compositor/recently_used_cache.h"
261
21
#include "mir/graphics/buffer.h"
21
#include "mir/graphics/buffer.h"
262
22
#include "mir/renderer/gl/texture_source.h"
263
23
264
24
#include <stdexcept>
265
25
#include <boost/throw_exception.hpp>
266
22
26
267
23
namespace mg = mir::graphics;
27
namespace mg = mir::graphics;
268
24
namespace mc = mir::compositor;
28
namespace mc = mir::compositor;
269
@@ -33,7 +37,13 @@
270
33
37
271
34
    if ((texture.last_bound_buffer != buffer_id) || (!texture.valid_binding))
38
    if ((texture.last_bound_buffer != buffer_id) || (!texture.valid_binding))
272
35
    {
39
    {
274
36
        buffer->gl_bind_to_texture();
40
        auto const texture_source =
275
41
            dynamic_cast<mir::renderer::gl::TextureSource*>(
276
42
                    buffer->native_buffer_base());
277
43
        if (!texture_source)
278
44
            BOOST_THROW_EXCEPTION(std::logic_error("Buffer does not support GL rendering"));
279
45
280
46
        texture_source->gl_bind_to_texture();
281
37
        texture.resource = buffer;
47
        texture.resource = buffer;
282
38
        texture.last_bound_buffer = buffer_id;
48
        texture.last_bound_buffer = buffer_id;
283
39
    }
49
    }
284
40
50
285
=== modified file 'src/server/compositor/screencast_display_buffer.cpp'
286
--- src/server/compositor/screencast_display_buffer.cpp	2015-06-24 08:17:02 +0000
287
+++ src/server/compositor/screencast_display_buffer.cpp	2015-09-04 06:51:35 +0000
288
@@ -28,8 +28,14 @@
289
28
mc::ScreencastDisplayBuffer::ScreencastDisplayBuffer(
28
mc::ScreencastDisplayBuffer::ScreencastDisplayBuffer(
290
29
    geom::Rectangle const& rect,
29
    geom::Rectangle const& rect,
291
30
    mg::Buffer& buffer)
30
    mg::Buffer& buffer)
293
31
    : rect(rect), buffer(buffer), old_fbo(), old_viewport()
31
    : rect(rect), buffer(buffer),
294
32
      texture_source(
295
33
          dynamic_cast<mir::renderer::gl::TextureSource*>(
296
34
              buffer.native_buffer_base())),
297
35
      old_fbo(), old_viewport()
298
32
{
36
{
299
37
    if (!texture_source)
300
38
        BOOST_THROW_EXCEPTION(std::logic_error("Buffer does not support GL rendering"));
301
33
    glGetIntegerv(GL_VIEWPORT, old_viewport);
39
    glGetIntegerv(GL_VIEWPORT, old_viewport);
302
34
    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &old_fbo);
40
    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &old_fbo);
303
35
41
304
@@ -68,7 +74,7 @@
305
68
void mc::ScreencastDisplayBuffer::make_current()
74
void mc::ScreencastDisplayBuffer::make_current()
306
69
{
75
{
307
70
    glBindTexture(GL_TEXTURE_2D, color_tex);
76
    glBindTexture(GL_TEXTURE_2D, color_tex);
309
71
    buffer.gl_bind_to_texture();
77
    texture_source->gl_bind_to_texture();
310
72
    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
78
    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
311
73
                           GL_TEXTURE_2D, color_tex, 0);
79
                           GL_TEXTURE_2D, color_tex, 0);
312
74
80
313
75
81
314
=== modified file 'src/server/compositor/screencast_display_buffer.h'
315
--- src/server/compositor/screencast_display_buffer.h	2015-06-24 08:17:02 +0000
316
+++ src/server/compositor/screencast_display_buffer.h	2015-09-04 06:51:35 +0000
317
@@ -20,6 +20,7 @@
318
20
#define MIR_COMPOSITOR_SCREENCAST_DISPLAY_BUFFER_H_
20
#define MIR_COMPOSITOR_SCREENCAST_DISPLAY_BUFFER_H_
319
21
21
320
22
#include "mir/graphics/display_buffer.h"
22
#include "mir/graphics/display_buffer.h"
321
23
#include "mir/renderer/gl/texture_source.h"
322
23
24
323
24
#include <GLES2/gl2.h>
25
#include <GLES2/gl2.h>
324
25
26
325
@@ -68,6 +69,7 @@
326
68
private:
69
private:
327
69
    geometry::Rectangle const rect;
70
    geometry::Rectangle const rect;
328
70
    graphics::Buffer& buffer;
71
    graphics::Buffer& buffer;
329
72
    renderer::gl::TextureSource* texture_source;
330
71
    GLint old_fbo;
73
    GLint old_fbo;
331
72
    GLint old_viewport[4];
74
    GLint old_viewport[4];
332
73
    detail::GLResource<glGenTextures,glDeleteTextures> const color_tex;
75
    detail::GLResource<glGenTextures,glDeleteTextures> const color_tex;
333
74
76
334
=== modified file 'src/server/compositor/temporary_buffers.cpp'
335
--- src/server/compositor/temporary_buffers.cpp	2015-08-27 13:41:02 +0000
336
+++ src/server/compositor/temporary_buffers.cpp	2015-09-04 06:51:35 +0000
337
@@ -75,11 +75,6 @@
338
75
    return buffer->id();
75
    return buffer->id();
339
76
}
76
}
340
77
77
341
78
void mc::TemporaryBuffer::gl_bind_to_texture()
342
79
{
343
80
    buffer->gl_bind_to_texture();
344
81
}
345
82
346
83
std::shared_ptr<mg::NativeBuffer> mc::TemporaryBuffer::native_buffer_handle() const
78
std::shared_ptr<mg::NativeBuffer> mc::TemporaryBuffer::native_buffer_handle() const
347
84
{
79
{
348
85
    return buffer->native_buffer_handle();
80
    return buffer->native_buffer_handle();
349
86
81
350
=== modified file 'src/server/compositor/temporary_buffers.h'
351
--- src/server/compositor/temporary_buffers.h	2015-08-27 13:41:02 +0000
352
+++ src/server/compositor/temporary_buffers.h	2015-09-04 06:51:35 +0000
353
@@ -39,7 +39,6 @@
354
39
    geometry::Stride stride() const override;
39
    geometry::Stride stride() const override;
355
40
    MirPixelFormat pixel_format() const override;
40
    MirPixelFormat pixel_format() const override;
356
41
    mg::BufferID id() const override;
41
    mg::BufferID id() const override;
357
42
    void gl_bind_to_texture() override;
358
43
    std::shared_ptr<mg::NativeBuffer> native_buffer_handle() const override;
42
    std::shared_ptr<mg::NativeBuffer> native_buffer_handle() const override;
359
44
    void write (unsigned char const* data, size_t size) override;
43
    void write (unsigned char const* data, size_t size) override;
360
45
    void read (std::function<void(unsigned char const*)> const& do_with_pixels) override;
44
    void read (std::function<void(unsigned char const*)> const& do_with_pixels) override;
361
46
45
362
=== modified file 'src/server/scene/CMakeLists.txt'
363
--- src/server/scene/CMakeLists.txt	2015-06-18 04:38:28 +0000
364
+++ src/server/scene/CMakeLists.txt	2015-09-04 06:51:35 +0000
365
@@ -1,3 +1,7 @@
366
1
include_directories(
367
2
  ${PROJECT_SOURCE_DIR}/src/renderers/gl/include
368
3
)
369
4
370
1
ADD_LIBRARY(
5
ADD_LIBRARY(
371
2
  mirscene OBJECT
6
  mirscene OBJECT
372
3
7
373
4
8
374
=== modified file 'src/server/scene/gl_pixel_buffer.cpp'
375
--- src/server/scene/gl_pixel_buffer.cpp	2015-02-22 07:46:25 +0000
376
+++ src/server/scene/gl_pixel_buffer.cpp	2015-09-04 06:51:35 +0000
377
@@ -19,6 +19,7 @@
378
19
#include "gl_pixel_buffer.h"
19
#include "gl_pixel_buffer.h"
379
20
#include "mir/graphics/gl_context.h"
20
#include "mir/graphics/gl_context.h"
380
21
#include "mir/graphics/buffer.h"
21
#include "mir/graphics/buffer.h"
381
22
#include "mir/renderer/gl/texture_source.h"
382
22
23
383
23
#include <stdexcept>
24
#include <stdexcept>
384
24
#include <boost/throw_exception.hpp>
25
#include <boost/throw_exception.hpp>
385
@@ -103,7 +104,12 @@
386
103
104
387
104
    prepare();
105
    prepare();
388
105
106
390
106
    buffer.gl_bind_to_texture();
107
    auto const texture_source =
391
108
        dynamic_cast<mir::renderer::gl::TextureSource*>(
392
109
            buffer.native_buffer_base());
393
110
    if (!texture_source)
394
111
        BOOST_THROW_EXCEPTION(std::logic_error("Buffer does not support GL rendering"));
395
112
    texture_source->gl_bind_to_texture();
396
107
113
397
108
    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex, 0);
114
    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex, 0);
398
109
115
399
110
116
400
=== modified file 'tests/CMakeLists.txt'
401
--- tests/CMakeLists.txt	2015-07-27 07:24:50 +0000
402
+++ tests/CMakeLists.txt	2015-09-04 06:51:35 +0000
403
@@ -54,6 +54,7 @@
404
54
  ${PROJECT_SOURCE_DIR}/include/client
54
  ${PROJECT_SOURCE_DIR}/include/client
405
55
  ${PROJECT_SOURCE_DIR}/include/common
55
  ${PROJECT_SOURCE_DIR}/include/common
406
56
  ${PROJECT_SOURCE_DIR}/include/test
56
  ${PROJECT_SOURCE_DIR}/include/test
407
57
  ${PROJECT_SOURCE_DIR}/src/renderers/gl/include
408
57
)
58
)
409
58
59
410
59
option(MIR_BUILD_ACCEPTANCE_TESTS "Build acceptance tests" ON)
60
option(MIR_BUILD_ACCEPTANCE_TESTS "Build acceptance tests" ON)
411
60
61
412
=== modified file 'tests/include/mir/test/doubles/mock_buffer.h'
413
--- tests/include/mir/test/doubles/mock_buffer.h	2015-08-27 13:41:02 +0000
414
+++ tests/include/mir/test/doubles/mock_buffer.h	2015-09-04 06:51:35 +0000
415
@@ -67,7 +67,6 @@
416
67
    MOCK_CONST_METHOD0(pixel_format, MirPixelFormat());
67
    MOCK_CONST_METHOD0(pixel_format, MirPixelFormat());
417
68
    MOCK_CONST_METHOD0(native_buffer_handle, std::shared_ptr<graphics::NativeBuffer>());
68
    MOCK_CONST_METHOD0(native_buffer_handle, std::shared_ptr<graphics::NativeBuffer>());
418
69
69
419
70
    MOCK_METHOD0(gl_bind_to_texture, void());
420
71
    MOCK_CONST_METHOD0(id, graphics::BufferID());
70
    MOCK_CONST_METHOD0(id, graphics::BufferID());
421
72
71
422
73
    MOCK_METHOD2(write, void(unsigned char const*, size_t));
72
    MOCK_METHOD2(write, void(unsigned char const*, size_t));
423
74
73
424
=== added file 'tests/include/mir/test/doubles/mock_gl_buffer.h'
425
--- tests/include/mir/test/doubles/mock_gl_buffer.h	1970-01-01 00:00:00 +0000
426
+++ tests/include/mir/test/doubles/mock_gl_buffer.h	2015-09-04 06:51:35 +0000
427
@@ -0,0 +1,45 @@
428
1
/*
429
2
 * Copyright © 2015 Canonical Ltd.
430
3
 *
431
4
 * This program is free software: you can redistribute it and/or modify it
432
5
 * under the terms of the GNU General Public License version 3,
433
6
 * as published by the Free Software Foundation.
434
7
 *
435
8
 * This program is distributed in the hope that it will be useful,
436
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
437
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
438
11
 * GNU General Public License for more details.
439
12
 *
440
13
 * You should have received a copy of the GNU General Public License
441
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
442
15
 *
443
16
 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
444
17
 */
445
18
446
19
#ifndef MIR_TEST_DOUBLES_MOCK_GL_BUFFER_H_
447
20
#define MIR_TEST_DOUBLES_MOCK_GL_BUFFER_H_
448
21
449
22
#include "mock_buffer.h"
450
23
#include "mir/renderer/gl/texture_source.h"
451
24
452
25
namespace mir
453
26
{
454
27
namespace test
455
28
{
456
29
namespace doubles
457
30
{
458
31
459
32
struct MockGLBuffer : public MockBuffer,
460
33
                      public renderer::gl::TextureSource
461
34
{
462
35
 public:
463
36
    using MockBuffer::MockBuffer;
464
37
465
38
    MOCK_METHOD0(gl_bind_to_texture, void());
466
39
};
467
40
468
41
}
469
42
}
470
43
}
471
44
472
45
#endif
473
0
46
474
=== modified file 'tests/include/mir/test/doubles/stub_buffer.h'
475
--- tests/include/mir/test/doubles/stub_buffer.h	2015-08-27 13:41:02 +0000
476
+++ tests/include/mir/test/doubles/stub_buffer.h	2015-09-04 06:51:35 +0000
477
@@ -99,7 +99,6 @@
478
99
    virtual MirPixelFormat pixel_format() const override { return buf_pixel_format; }
99
    virtual MirPixelFormat pixel_format() const override { return buf_pixel_format; }
479
100
100
480
101
    virtual std::shared_ptr<graphics::NativeBuffer> native_buffer_handle() const override { return native_buffer; }
101
    virtual std::shared_ptr<graphics::NativeBuffer> native_buffer_handle() const override { return native_buffer; }
481
102
    virtual void gl_bind_to_texture() override {}
482
103
102
483
104
    void write(unsigned char const* pixels, size_t len) override
103
    void write(unsigned char const* pixels, size_t len) override
484
105
    {
104
    {
485
106
105
486
=== added file 'tests/include/mir/test/doubles/stub_gl_buffer.h'
487
--- tests/include/mir/test/doubles/stub_gl_buffer.h	1970-01-01 00:00:00 +0000
488
+++ tests/include/mir/test/doubles/stub_gl_buffer.h	2015-09-04 06:51:35 +0000
489
@@ -0,0 +1,45 @@
490
1
/*
491
2
 * Copyright © 2015 Canonical Ltd.
492
3
 *
493
4
 * This program is free software: you can redistribute it and/or modify it
494
5
 * under the terms of the GNU General Public License version 3,
495
6
 * as published by the Free Software Foundation.
496
7
 *
497
8
 * This program is distributed in the hope that it will be useful,
498
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
499
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
500
11
 * GNU General Public License for more details.
501
12
 *
502
13
 * You should have received a copy of the GNU General Public License
503
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
504
15
 *
505
16
 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
506
17
 */
507
18
508
19
#ifndef MIR_TEST_DOUBLES_STUB_GL_BUFFER_H_
509
20
#define MIR_TEST_DOUBLES_STUB_GL_BUFFER_H_
510
21
511
22
#include "stub_buffer.h"
512
23
#include "mir/renderer/gl/texture_source.h"
513
24
514
25
namespace mir
515
26
{
516
27
namespace test
517
28
{
518
29
namespace doubles
519
30
{
520
31
521
32
class StubGLBuffer : public StubBuffer,
522
33
                     public renderer::gl::TextureSource
523
34
{
524
35
public:
525
36
    using StubBuffer::StubBuffer;
526
37
527
38
    void gl_bind_to_texture() {}
528
39
};
529
40
530
41
}
531
42
}
532
43
}
533
44
534
45
#endif
535
0
46
536
=== added file 'tests/include/mir/test/doubles/stub_gl_buffer_allocator.h'
537
--- tests/include/mir/test/doubles/stub_gl_buffer_allocator.h	1970-01-01 00:00:00 +0000
538
+++ tests/include/mir/test/doubles/stub_gl_buffer_allocator.h	2015-09-04 06:51:35 +0000
539
@@ -0,0 +1,45 @@
540
1
/*
541
2
 * Copyright © 2015 Canonical Ltd.
542
3
 *
543
4
 * This program is free software: you can redistribute it and/or modify it
544
5
 * under the terms of the GNU General Public License version 3,
545
6
 * as published by the Free Software Foundation.
546
7
 *
547
8
 * This program is distributed in the hope that it will be useful,
548
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
549
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
550
11
 * GNU General Public License for more details.
551
12
 *
552
13
 * You should have received a copy of the GNU General Public License
553
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
554
15
 *
555
16
 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
556
17
 */
557
18
558
19
#ifndef MIR_TEST_DOUBLES_STUB_GL_BUFFER_ALLOCATOR_H_
559
20
#define MIR_TEST_DOUBLES_STUB_GL_BUFFER_ALLOCATOR_H_
560
21
561
22
#include "stub_buffer_allocator.h"
562
23
#include "stub_gl_buffer.h"
563
24
564
25
namespace mir
565
26
{
566
27
namespace test
567
28
{
568
29
namespace doubles
569
30
{
570
31
571
32
struct StubGLBufferAllocator : public StubBufferAllocator
572
33
{
573
34
    std::shared_ptr<graphics::Buffer> alloc_buffer(
574
35
        graphics::BufferProperties const& properties) override
575
36
    {
576
37
        return std::make_shared<StubGLBuffer>(properties);
577
38
    }
578
39
};
579
40
580
41
}
581
42
}
582
43
}
583
44
584
45
#endif
585
0
46
586
=== modified file 'tests/integration-tests/graphics/mesa/test_buffer_integration.cpp'
587
--- tests/integration-tests/graphics/mesa/test_buffer_integration.cpp	2015-06-25 13:43:43 +0000
588
+++ tests/integration-tests/graphics/mesa/test_buffer_integration.cpp	2015-09-04 06:51:35 +0000
589
@@ -28,6 +28,7 @@
590
28
#include "mir/test/doubles/stub_gl_program_factory.h"
28
#include "mir/test/doubles/stub_gl_program_factory.h"
591
29
#include "mir/test/doubles/null_emergency_cleanup.h"
29
#include "mir/test/doubles/null_emergency_cleanup.h"
592
30
#include "mir/graphics/default_display_configuration_policy.h"
30
#include "mir/graphics/default_display_configuration_policy.h"
593
31
#include "mir/renderer/gl/texture_source.h"
594
31
#include "src/server/report/null_report_factory.h"
32
#include "src/server/report/null_report_factory.h"
595
32
33
596
33
#include "mir_test_framework/testing_server_configuration.h"
34
#include "mir_test_framework/testing_server_configuration.h"
597
@@ -46,7 +47,15 @@
598
46
namespace mir
47
namespace mir
599
47
{
48
{
600
48
49
602
49
class StubBufferThread : public mtd::StubBuffer
50
mir::renderer::gl::TextureSource* as_texture_source(
603
51
    std::shared_ptr<mg::Buffer> const& buffer)
604
52
{
605
53
    return dynamic_cast<mir::renderer::gl::TextureSource*>(
606
54
        buffer->native_buffer_base());
607
55
}
608
56
609
57
class StubBufferThread : public mtd::StubBuffer,
610
58
                         public mir::renderer::gl::TextureSource
611
50
{
59
{
612
51
public:
60
public:
613
52
    StubBufferThread() :
61
    StubBufferThread() :
614
@@ -179,7 +188,7 @@
615
179
188
616
180
        try
189
        try
617
181
        {
190
        {
619
182
            buffer->gl_bind_to_texture();
191
            as_texture_source(buffer)->gl_bind_to_texture();
620
183
        }
192
        }
621
184
        catch(std::runtime_error const&)
193
        catch(std::runtime_error const&)
622
185
        {
194
        {
623
@@ -211,7 +220,7 @@
624
211
220
625
212
    EXPECT_NO_THROW({
221
    EXPECT_NO_THROW({
626
213
        auto buffer = allocator->alloc_buffer(buffer_properties);
222
        auto buffer = allocator->alloc_buffer(buffer_properties);
628
214
        buffer->gl_bind_to_texture();
223
        as_texture_source(buffer)->gl_bind_to_texture();
629
215
        ASSERT_EQ(EGL_SUCCESS, eglGetError());
224
        ASSERT_EQ(EGL_SUCCESS, eglGetError());
630
216
225
631
217
        BufferDestructorThread destructor{std::move(buffer)};
226
        BufferDestructorThread destructor{std::move(buffer)};
632
218
227
633
=== modified file 'tests/integration-tests/test_session.cpp'
634
--- tests/integration-tests/test_session.cpp	2015-06-26 08:00:59 +0000
635
+++ tests/integration-tests/test_session.cpp	2015-09-04 06:51:35 +0000
636
@@ -30,6 +30,7 @@
637
30
#include "mir/frontend/connector.h"
30
#include "mir/frontend/connector.h"
638
31
31
639
32
#include "mir/test/doubles/stub_buffer_allocator.h"
32
#include "mir/test/doubles/stub_buffer_allocator.h"
640
33
#include "mir/test/doubles/stub_gl_buffer.h"
641
33
#include "mir/test/doubles/stub_buffer_stream_factory.h"
34
#include "mir/test/doubles/stub_buffer_stream_factory.h"
642
34
#include "mir/test/doubles/stub_display.h"
35
#include "mir/test/doubles/stub_display.h"
643
35
#include "mir/test/doubles/null_event_sink.h"
36
#include "mir/test/doubles/null_event_sink.h"
644
@@ -86,6 +87,25 @@
645
86
    cv.wait(lock, [&]{ return done; });
87
    cv.wait(lock, [&]{ return done; });
646
87
}
88
}
647
88
89
648
90
struct StubGLBufferStream : public mtd::StubBufferStream
649
91
{
650
92
public:
651
93
    StubGLBufferStream()
652
94
    {
653
95
        stub_compositor_buffer = std::make_shared<mtd::StubGLBuffer>();
654
96
    }
655
97
};
656
98
657
99
struct StubGLBufferStreamFactory : public mtd::StubBufferStreamFactory
658
100
{
659
101
    std::shared_ptr<mc::BufferStream> create_buffer_stream(
660
102
        mf::BufferStreamId, std::shared_ptr<mf::BufferSink> const&,
661
103
        mg::BufferProperties const&) override
662
104
    {
663
105
        return std::make_shared<StubGLBufferStream>();
664
106
    }
665
107
};
666
108
667
89
} // anonymouse namespace
109
} // anonymouse namespace
668
90
110
669
91
TEST(ApplicationSession, stress_test_take_snapshot)
111
TEST(ApplicationSession, stress_test_take_snapshot)
670
@@ -97,7 +117,7 @@
671
97
    ms::ApplicationSession session{
117
    ms::ApplicationSession session{
672
98
        conf.the_surface_coordinator(),
118
        conf.the_surface_coordinator(),
673
99
        conf.the_surface_factory(),
119
        conf.the_surface_factory(),
675
100
        std::make_shared<mtd::StubBufferStreamFactory>(),
120
        std::make_shared<StubGLBufferStreamFactory>(),
676
101
        __LINE__,
121
        __LINE__,
677
102
        "stress",
122
        "stress",
678
103
        conf.the_snapshot_strategy(),
123
        conf.the_snapshot_strategy(),
679
104
124
680
=== modified file 'tests/unit-tests/compositor/test_compositing_screencast.cpp'
681
--- tests/unit-tests/compositor/test_compositing_screencast.cpp	2015-06-25 03:00:08 +0000
682
+++ tests/unit-tests/compositor/test_compositing_screencast.cpp	2015-09-04 06:51:35 +0000
683
@@ -27,7 +27,7 @@
684
27
#include "mir/test/doubles/null_display.h"
27
#include "mir/test/doubles/null_display.h"
685
28
#include "mir/test/doubles/null_display_buffer_compositor_factory.h"
28
#include "mir/test/doubles/null_display_buffer_compositor_factory.h"
686
29
#include "mir/test/doubles/stub_display_configuration.h"
29
#include "mir/test/doubles/stub_display_configuration.h"
688
30
#include "mir/test/doubles/stub_buffer_allocator.h"
30
#include "mir/test/doubles/stub_gl_buffer_allocator.h"
689
31
#include "mir/test/doubles/mock_buffer.h"
31
#include "mir/test/doubles/mock_buffer.h"
690
32
#include "mir/test/doubles/mock_gl.h"
32
#include "mir/test/doubles/mock_gl.h"
691
33
#include "mir/test/doubles/stub_scene.h"
33
#include "mir/test/doubles/stub_scene.h"
692
@@ -170,7 +170,7 @@
693
170
    testing::NiceMock<mtd::MockGL> mock_gl;
170
    testing::NiceMock<mtd::MockGL> mock_gl;
694
171
    mtd::StubScene stub_scene;
171
    mtd::StubScene stub_scene;
695
172
    StubDisplay stub_display;
172
    StubDisplay stub_display;
697
173
    mtd::StubBufferAllocator stub_buffer_allocator;
173
    mtd::StubGLBufferAllocator stub_buffer_allocator;
698
174
    mtd::NullDisplayBufferCompositorFactory stub_db_compositor_factory;
174
    mtd::NullDisplayBufferCompositorFactory stub_db_compositor_factory;
699
175
    mc::CompositingScreencast screencast;
175
    mc::CompositingScreencast screencast;
700
176
    geom::Size const default_size;
176
    geom::Size const default_size;
701
@@ -250,7 +250,7 @@
702
250
    using namespace testing;
250
    using namespace testing;
703
251
251
704
252
    MockBufferAllocator mock_buffer_allocator;
252
    MockBufferAllocator mock_buffer_allocator;
706
253
    mtd::StubBuffer stub_buffer;
253
    mtd::StubGLBuffer stub_buffer;
707
254
254
708
255
    InSequence s;
255
    InSequence s;
709
256
    EXPECT_CALL(mock_buffer_allocator,
256
    EXPECT_CALL(mock_buffer_allocator,
710
@@ -274,8 +274,8 @@
711
274
    using namespace testing;
274
    using namespace testing;
712
275
275
713
276
    MockBufferAllocator mock_buffer_allocator;
276
    MockBufferAllocator mock_buffer_allocator;
716
277
    mtd::StubBuffer stub_buffer1;
277
    mtd::StubGLBuffer stub_buffer1;
717
278
    mtd::StubBuffer stub_buffer2;
278
    mtd::StubGLBuffer stub_buffer2;
718
279
279
719
280
    EXPECT_CALL(mock_buffer_allocator, alloc_buffer(_))
280
    EXPECT_CALL(mock_buffer_allocator, alloc_buffer(_))
720
281
        .WillOnce(Return(mt::fake_shared(stub_buffer1)))
281
        .WillOnce(Return(mt::fake_shared(stub_buffer1)))
721
@@ -306,7 +306,7 @@
722
306
    NiceMock<mtd::MockScene> mock_scene;
306
    NiceMock<mtd::MockScene> mock_scene;
723
307
    NiceMock<MockBufferAllocator> mock_buffer_allocator;
307
    NiceMock<MockBufferAllocator> mock_buffer_allocator;
724
308
    ON_CALL(mock_buffer_allocator, alloc_buffer(_))
308
    ON_CALL(mock_buffer_allocator, alloc_buffer(_))
726
309
        .WillByDefault(Return(std::make_shared<mtd::StubBuffer>()));
309
        .WillByDefault(Return(std::make_shared<mtd::StubGLBuffer>()));
727
310
310
728
311
    EXPECT_CALL(mock_scene, register_compositor(_))
311
    EXPECT_CALL(mock_scene, register_compositor(_))
729
312
        .Times(1);
312
        .Times(1);
730
313
313
731
=== modified file 'tests/unit-tests/compositor/test_gl_renderer.cpp'
732
--- tests/unit-tests/compositor/test_gl_renderer.cpp	2015-06-25 03:00:08 +0000
733
+++ tests/unit-tests/compositor/test_gl_renderer.cpp	2015-09-04 06:51:35 +0000
734
@@ -24,7 +24,7 @@
735
24
#include <mir/graphics/gl_texture.h>
24
#include <mir/graphics/gl_texture.h>
736
25
#include <mir/compositor/gl_renderer.h>
25
#include <mir/compositor/gl_renderer.h>
737
26
#include <mir/test/fake_shared.h>
26
#include <mir/test/fake_shared.h>
739
27
#include <mir/test/doubles/mock_buffer.h>
27
#include <mir/test/doubles/mock_gl_buffer.h>
740
28
#include <mir/test/doubles/mock_renderable.h>
28
#include <mir/test/doubles/mock_renderable.h>
741
29
#include <mir/test/doubles/mock_buffer_stream.h>
29
#include <mir/test/doubles/mock_buffer_stream.h>
742
30
#include <mir/compositor/buffer_stream.h>
30
#include <mir/compositor/buffer_stream.h>
743
@@ -114,7 +114,7 @@
744
114
        EXPECT_CALL(mock_gl, glDrawArrays(_, _, _)).Times(AnyNumber());
114
        EXPECT_CALL(mock_gl, glDrawArrays(_, _, _)).Times(AnyNumber());
745
115
        EXPECT_CALL(mock_gl, glDisableVertexAttribArray(_)).Times(AnyNumber());
115
        EXPECT_CALL(mock_gl, glDisableVertexAttribArray(_)).Times(AnyNumber());
746
116
116
748
117
        mock_buffer = std::make_shared<mtd::MockBuffer>();
117
        mock_buffer = std::make_shared<mtd::MockGLBuffer>();
749
118
        EXPECT_CALL(*mock_buffer, gl_bind_to_texture()).Times(AnyNumber());
118
        EXPECT_CALL(*mock_buffer, gl_bind_to_texture()).Times(AnyNumber());
750
119
        EXPECT_CALL(*mock_buffer, id())
119
        EXPECT_CALL(*mock_buffer, id())
751
120
            .WillRepeatedly(Return(mir::graphics::BufferID(789)));
120
            .WillRepeatedly(Return(mir::graphics::BufferID(789)));
752
@@ -144,7 +144,7 @@
753
144
144
754
145
    testing::NiceMock<mtd::MockGL> mock_gl;
145
    testing::NiceMock<mtd::MockGL> mock_gl;
755
146
    testing::NiceMock<mtd::MockEGL> mock_egl;
146
    testing::NiceMock<mtd::MockEGL> mock_egl;
757
147
    std::shared_ptr<mtd::MockBuffer> mock_buffer;
147
    std::shared_ptr<mtd::MockGLBuffer> mock_buffer;
758
148
    mir::geometry::Rectangle display_area;
148
    mir::geometry::Rectangle display_area;
759
149
    std::shared_ptr<testing::NiceMock<mtd::MockRenderable>> renderable;
149
    std::shared_ptr<testing::NiceMock<mtd::MockRenderable>> renderable;
760
150
    mg::RenderableList renderable_list;
150
    mg::RenderableList renderable_list;
761
151
151
762
=== modified file 'tests/unit-tests/compositor/test_gl_texture_cache.cpp'
763
--- tests/unit-tests/compositor/test_gl_texture_cache.cpp	2015-06-25 03:00:08 +0000
764
+++ tests/unit-tests/compositor/test_gl_texture_cache.cpp	2015-09-04 06:51:35 +0000
765
@@ -18,7 +18,7 @@
766
18
 */
18
 */
767
19
19
768
20
#include "mir/compositor/recently_used_cache.h"
20
#include "mir/compositor/recently_used_cache.h"
770
21
#include "mir/test/doubles/mock_buffer.h"
21
#include "mir/test/doubles/mock_gl_buffer.h"
771
22
#include "mir/test/doubles/mock_renderable.h"
22
#include "mir/test/doubles/mock_renderable.h"
772
23
#include "mir/test/doubles/mock_gl.h"
23
#include "mir/test/doubles/mock_gl.h"
773
24
#include <gtest/gtest.h>
24
#include <gtest/gtest.h>
774
@@ -29,13 +29,14 @@
775
29
29
776
30
namespace
30
namespace
777
31
{
31
{
778
32
779
32
class RecentlyUsedCache : public testing::Test
33
class RecentlyUsedCache : public testing::Test
780
33
{
34
{
781
34
public:
35
public:
782
35
    RecentlyUsedCache()
36
    RecentlyUsedCache()
783
36
    {
37
    {
784
37
        using namespace testing;
38
        using namespace testing;
786
38
        mock_buffer = std::make_shared<NiceMock<mtd::MockBuffer>>();
39
        mock_buffer = std::make_shared<NiceMock<mtd::MockGLBuffer>>();
787
39
        renderable = std::make_shared<NiceMock<mtd::MockRenderable>>();
40
        renderable = std::make_shared<NiceMock<mtd::MockRenderable>>();
788
40
        ON_CALL(*renderable, buffer())
41
        ON_CALL(*renderable, buffer())
789
41
            .WillByDefault(Return(mock_buffer));
42
            .WillByDefault(Return(mock_buffer));
790
@@ -44,7 +45,7 @@
791
44
    }
45
    }
792
45
46
793
46
    testing::NiceMock<mtd::MockGL> mock_gl;
47
    testing::NiceMock<mtd::MockGL> mock_gl;
795
47
    std::shared_ptr<mtd::MockBuffer> mock_buffer;
48
    std::shared_ptr<mtd::MockGLBuffer> mock_buffer;
796
48
    std::shared_ptr<testing::NiceMock<mtd::MockRenderable>> renderable;
49
    std::shared_ptr<testing::NiceMock<mtd::MockRenderable>> renderable;
797
49
    GLuint const stub_texture{1};
50
    GLuint const stub_texture{1};
798
50
};
51
};
799
51
52
800
=== modified file 'tests/unit-tests/compositor/test_screencast_display_buffer.cpp'
801
--- tests/unit-tests/compositor/test_screencast_display_buffer.cpp	2015-06-25 03:00:08 +0000
802
+++ tests/unit-tests/compositor/test_screencast_display_buffer.cpp	2015-09-04 06:51:35 +0000
803
@@ -18,8 +18,8 @@
804
18
18
805
19
#include "src/server/compositor/screencast_display_buffer.h"
19
#include "src/server/compositor/screencast_display_buffer.h"
806
20
20
809
21
#include "mir/test/doubles/mock_buffer.h"
21
#include "mir/test/doubles/mock_gl_buffer.h"
810
22
#include "mir/test/doubles/stub_buffer.h"
22
#include "mir/test/doubles/stub_gl_buffer.h"
811
23
#include "mir/test/doubles/mock_gl.h"
23
#include "mir/test/doubles/mock_gl.h"
812
24
#include "mir/test/doubles/stub_renderable.h"
24
#include "mir/test/doubles/stub_renderable.h"
813
25
25
814
@@ -60,7 +60,7 @@
815
60
    EXPECT_CALL(mock_gl, glDeleteFramebuffers(1,Pointee(framebuffer)));
60
    EXPECT_CALL(mock_gl, glDeleteFramebuffers(1,Pointee(framebuffer)));
816
61
61
817
62
    geom::Rectangle const rect{{100,100}, {800,600}};
62
    geom::Rectangle const rect{{100,100}, {800,600}};
819
63
    mtd::StubBuffer stub_buffer;
63
    mtd::StubGLBuffer stub_buffer;
820
64
64
821
65
    mc::ScreencastDisplayBuffer db{rect, stub_buffer};
65
    mc::ScreencastDisplayBuffer db{rect, stub_buffer};
822
66
}
66
}
823
@@ -87,7 +87,7 @@
824
87
    EXPECT_CALL(mock_gl, glDeleteFramebuffers(1,Pointee(framebuffer)));
87
    EXPECT_CALL(mock_gl, glDeleteFramebuffers(1,Pointee(framebuffer)));
825
88
88
826
89
    geom::Rectangle const rect{{100,100}, {800,600}};
89
    geom::Rectangle const rect{{100,100}, {800,600}};
828
90
    mtd::StubBuffer stub_buffer;
90
    mtd::StubGLBuffer stub_buffer;
829
91
91
830
92
    EXPECT_THROW({
92
    EXPECT_THROW({
831
93
        mc::ScreencastDisplayBuffer db(rect, stub_buffer);
93
        mc::ScreencastDisplayBuffer db(rect, stub_buffer);
832
@@ -99,7 +99,7 @@
833
99
    using namespace testing;
99
    using namespace testing;
834
100
100
835
101
    geom::Rectangle const rect{{100,100}, {800,600}};
101
    geom::Rectangle const rect{{100,100}, {800,600}};
837
102
    testing::NiceMock<mtd::MockBuffer> mock_buffer{
102
    testing::NiceMock<mtd::MockGLBuffer> mock_buffer{
838
103
        rect.size, geom::Stride{100}, mir_pixel_format_xbgr_8888};
103
        rect.size, geom::Stride{100}, mir_pixel_format_xbgr_8888};
839
104
104
840
105
    /* Set the buffer as rendering target */
105
    /* Set the buffer as rendering target */
841
@@ -116,7 +116,7 @@
842
116
    using namespace testing;
116
    using namespace testing;
843
117
117
844
118
    geom::Rectangle const rect{{100,100}, {800,600}};
118
    geom::Rectangle const rect{{100,100}, {800,600}};
846
119
    testing::NiceMock<mtd::MockBuffer> mock_buffer{
119
    testing::NiceMock<mtd::MockGLBuffer> mock_buffer{
847
120
        rect.size, geom::Stride{100}, mir_pixel_format_xbgr_8888};
120
        rect.size, geom::Stride{100}, mir_pixel_format_xbgr_8888};
848
121
121
849
122
    InSequence s;
122
    InSequence s;
850
@@ -138,7 +138,7 @@
851
138
    using namespace testing;
138
    using namespace testing;
852
139
139
853
140
    geom::Rectangle const rect{{100,100}, {800,600}};
140
    geom::Rectangle const rect{{100,100}, {800,600}};
855
141
    mtd::StubBuffer stub_buffer;
141
    mtd::StubGLBuffer stub_buffer;
856
142
142
857
143
    mc::ScreencastDisplayBuffer db{rect, stub_buffer};
143
    mc::ScreencastDisplayBuffer db{rect, stub_buffer};
858
144
144
859
@@ -151,7 +151,7 @@
860
151
TEST_F(ScreencastDisplayBufferTest, rejects_attempt_to_optimize)
151
TEST_F(ScreencastDisplayBufferTest, rejects_attempt_to_optimize)
861
152
{
152
{
862
153
    geom::Rectangle const rect{{100,100}, {800,600}};
153
    geom::Rectangle const rect{{100,100}, {800,600}};
864
154
    mtd::StubBuffer stub_buffer;
154
    mtd::StubGLBuffer stub_buffer;
865
155
155
866
156
    mg::RenderableList renderables{
156
    mg::RenderableList renderables{
867
157
        std::make_shared<mtd::StubRenderable>(),
157
        std::make_shared<mtd::StubRenderable>(),
868
158
158
869
=== modified file 'tests/unit-tests/compositor/test_temporary_buffers.cpp'
870
--- tests/unit-tests/compositor/test_temporary_buffers.cpp	2015-08-27 13:41:02 +0000
871
+++ tests/unit-tests/compositor/test_temporary_buffers.cpp	2015-09-04 06:51:35 +0000
872
@@ -126,15 +126,6 @@
873
126
    EXPECT_EQ(buffer_pixel_format, pixel_format);
126
    EXPECT_EQ(buffer_pixel_format, pixel_format);
874
127
}
127
}
875
128
128
876
129
TEST_F(TemporaryBuffersTest, base_gl_bind_to_texture)
877
130
{
878
131
    TemporaryTestBuffer proxy_buffer(mock_buffer);
879
132
    EXPECT_CALL(*mock_buffer, gl_bind_to_texture())
880
133
        .Times(1);
881
134
882
135
    proxy_buffer.gl_bind_to_texture();
883
136
}
884
137
885
138
TEST_F(TemporaryBuffersTest, base_test_id)
129
TEST_F(TemporaryBuffersTest, base_test_id)
886
139
{
130
{
887
140
    TemporaryTestBuffer proxy_buffer(mock_buffer);
131
    TemporaryTestBuffer proxy_buffer(mock_buffer);
888
141
132
889
=== modified file 'tests/unit-tests/graphics/mesa/kms/test_gbm_buffer.cpp'
890
--- tests/unit-tests/graphics/mesa/kms/test_gbm_buffer.cpp	2015-07-23 02:39:20 +0000
891
+++ tests/unit-tests/graphics/mesa/kms/test_gbm_buffer.cpp	2015-09-04 06:51:35 +0000
892
@@ -75,6 +75,11 @@
893
75
        allocator.reset(new mgm::BufferAllocator(platform->gbm.device, mgm::BypassOption::allowed, mgm::BufferImportMethod::gbm_native_pixmap));
75
        allocator.reset(new mgm::BufferAllocator(platform->gbm.device, mgm::BypassOption::allowed, mgm::BufferImportMethod::gbm_native_pixmap));
894
76
    }
76
    }
895
77
77
896
78
    mir::renderer::gl::TextureSource* as_texture_source(std::shared_ptr<mg::Buffer> const& buffer)
897
79
    {
898
80
        return dynamic_cast<mir::renderer::gl::TextureSource*>(buffer->native_buffer_base());
899
81
    }
900
82
901
78
    ::testing::NiceMock<mtd::MockDRM> mock_drm;
83
    ::testing::NiceMock<mtd::MockDRM> mock_drm;
902
79
    ::testing::NiceMock<mtd::MockGBM> mock_gbm;
84
    ::testing::NiceMock<mtd::MockGBM> mock_gbm;
903
80
    ::testing::NiceMock<mtd::MockEGL> mock_egl;
85
    ::testing::NiceMock<mtd::MockEGL> mock_egl;
904
@@ -196,7 +201,7 @@
905
196
201
906
197
    EXPECT_THROW({
202
    EXPECT_THROW({
907
198
        auto buffer = allocator->alloc_buffer(buffer_properties);
203
        auto buffer = allocator->alloc_buffer(buffer_properties);
909
199
        buffer->gl_bind_to_texture();
204
        as_texture_source(buffer)->gl_bind_to_texture();
910
200
    }, std::runtime_error);
205
    }, std::runtime_error);
911
201
}
206
}
912
202
207
913
@@ -219,6 +224,6 @@
914
219
224
915
220
    EXPECT_NO_THROW({
225
    EXPECT_NO_THROW({
916
221
        auto buffer = allocator->alloc_buffer(buffer_properties);
226
        auto buffer = allocator->alloc_buffer(buffer_properties);
918
222
        buffer->gl_bind_to_texture();
227
        as_texture_source(buffer)->gl_bind_to_texture();
919
223
    });
228
    });
920
224
}
229
}
921
225
230
922
=== modified file 'tests/unit-tests/scene/test_gl_pixel_buffer.cpp'
923
--- tests/unit-tests/scene/test_gl_pixel_buffer.cpp	2015-06-25 03:00:08 +0000
924
+++ tests/unit-tests/scene/test_gl_pixel_buffer.cpp	2015-09-04 06:51:35 +0000
925
@@ -19,7 +19,7 @@
926
19
#include "src/server/scene/gl_pixel_buffer.h"
19
#include "src/server/scene/gl_pixel_buffer.h"
927
20
#include "mir/graphics/gl_context.h"
20
#include "mir/graphics/gl_context.h"
928
21
21
930
22
#include "mir/test/doubles/mock_buffer.h"
22
#include "mir/test/doubles/mock_gl_buffer.h"
931
23
#include "mir/test/doubles/mock_gl.h"
23
#include "mir/test/doubles/mock_gl.h"
932
24
24
933
25
#include <gmock/gmock.h>
25
#include <gmock/gmock.h>
934
@@ -68,7 +68,7 @@
935
68
    }
68
    }
936
69
69
937
70
    testing::NiceMock<mtd::MockGL> mock_gl;
70
    testing::NiceMock<mtd::MockGL> mock_gl;
939
71
    testing::NiceMock<mtd::MockBuffer> mock_buffer;
71
    testing::NiceMock<mtd::MockGLBuffer> mock_buffer;
940
72
    MockGLContext mock_context;
72
    MockGLContext mock_context;
941
73
    std::unique_ptr<WrappingGLContext> context;
73
    std::unique_ptr<WrappingGLContext> context;
942
74
};
74
};
Status:	Merged
Approved by:	Cemil Azizoglu on 2015-09-08
Approved revision:	no longer in the source branch.
Merged at revision:	2911
Proposed branch:	lp:~afrantzis/mir/texture-bindable-over-native-buffer-base
Merge into:	lp:mir
Prerequisite:	lp:~afrantzis/mir/update-mirplatform-abi-standalone
Diff against target:	942 lines (+312/-56) 33 files modified examples/CMakeLists.txt (+2/-0) examples/buffer_render_target.cpp (+7/-1) examples/server_example_adorning_compositor.cpp (+12/-1) include/platform/mir/graphics/buffer.h (+0/-1) src/platform/symbols.map (+0/-1) src/platforms/CMakeLists.txt (+1/-0) src/platforms/android/server/buffer.h (+3/-1) src/platforms/mesa/server/common/gbm_buffer.h (+3/-1) src/platforms/mesa/server/common/shm_buffer.h (+3/-1) src/renderers/gl/include/mir/renderer/gl/texture_source.h (+46/-0) src/server/compositor/CMakeLists.txt (+4/-0) src/server/compositor/recently_used_cache.cpp (+11/-1) src/server/compositor/screencast_display_buffer.cpp (+8/-2) src/server/compositor/screencast_display_buffer.h (+2/-0) src/server/compositor/temporary_buffers.cpp (+0/-5) src/server/compositor/temporary_buffers.h (+0/-1) src/server/scene/CMakeLists.txt (+4/-0) src/server/scene/gl_pixel_buffer.cpp (+7/-1) tests/CMakeLists.txt (+1/-0) tests/include/mir/test/doubles/mock_buffer.h (+0/-1) tests/include/mir/test/doubles/mock_gl_buffer.h (+45/-0) tests/include/mir/test/doubles/stub_buffer.h (+0/-1) tests/include/mir/test/doubles/stub_gl_buffer.h (+45/-0) tests/include/mir/test/doubles/stub_gl_buffer_allocator.h (+45/-0) tests/integration-tests/graphics/mesa/test_buffer_integration.cpp (+12/-3) tests/integration-tests/test_session.cpp (+21/-1) tests/unit-tests/compositor/test_compositing_screencast.cpp (+6/-6) tests/unit-tests/compositor/test_gl_renderer.cpp (+3/-3) tests/unit-tests/compositor/test_gl_texture_cache.cpp (+4/-3) tests/unit-tests/compositor/test_screencast_display_buffer.cpp (+8/-8) tests/unit-tests/compositor/test_temporary_buffers.cpp (+0/-9) tests/unit-tests/graphics/mesa/kms/test_gbm_buffer.cpp (+7/-2) tests/unit-tests/scene/test_gl_pixel_buffer.cpp (+2/-2)
To merge this branch:	bzr merge lp:~afrantzis/mir/texture-bindable-over-native-buffer-base
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Cemil Azizoglu (community)			Approve on 2015-09-08
PS Jenkins bot (community)	continuous-integration		Approve on 2015-09-07
Kevin DuBois (community)			Approve on 2015-09-03
Alan Griffiths		2015-09-01	Abstain on 2015-09-01
Review via email: mp+269739@code.launchpad.net