1
=== added file 'include/platform/mir/graphics/gl_format.h'
2
--- include/platform/mir/graphics/gl_format.h	1970-01-01 00:00:00 +0000
3
+++ include/platform/mir/graphics/gl_format.h	2017-02-20 13:18:16 +0000
4
@@ -0,0 +1,31 @@
5
1
/*
6
2
 * Copyright © 2017 Canonical Ltd.
7
3
 *
8
4
 * This program is free software: you can redistribute it and/or modify it
9
5
 * under the terms of the GNU Lesser General Public License version 3,
10
6
 * as published by the Free Software Foundation.
11
7
 *
12
8
 * This program is distributed in the hope that it will be useful,
13
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
11
 * GNU Lesser General Public License for more details.
16
12
 *
17
13
 * You should have received a copy of the GNU Lesser General Public License
18
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
15
 *
20
16
 */
21
17
22
18
#ifndef MIR_GRAPHICS_COMMON_GL_FORMAT_H_
23
19
#define MIR_GRAPHICS_COMMON_GL_FORMAT_H_
24
20
#include MIR_SERVER_GL_H
25
21
#include "mir_toolkit/common.h"
26
22
27
23
namespace mir
28
24
{
29
25
namespace graphics
30
26
{
31
27
bool get_gl_pixel_format(MirPixelFormat mir_format,
32
28
                         GLenum& gl_format, GLenum& gl_type);
33
29
}
34
30
}
35
31
#endif /* MIR_GRAPHICS_COMMON_GL_FORMAT_H_ */
36
0
32
37
=== modified file 'src/platforms/common/server/shm_buffer.cpp'
38
--- src/platforms/common/server/shm_buffer.cpp	2017-01-18 02:29:37 +0000
39
+++ src/platforms/common/server/shm_buffer.cpp	2017-02-20 13:18:16 +0000
40
@@ -17,9 +17,11 @@
41
17
 *   Alexandros Frantzis <alexandros.frantzis@canonical.com>
17
 *   Alexandros Frantzis <alexandros.frantzis@canonical.com>
42
18
 */
18
 */
43
19
19
44
20
#include "mir/graphics/gl_format.h"
45
20
#include "shm_file.h"
21
#include "shm_file.h"
46
21
#include "shm_buffer.h"
22
#include "shm_buffer.h"
47
22
#include "buffer_texture_binder.h"
23
#include "buffer_texture_binder.h"
48
24
49
23
#include MIR_SERVER_GL_H
25
#include MIR_SERVER_GL_H
50
24
#include MIR_SERVER_GLEXT_H
26
#include MIR_SERVER_GLEXT_H
51
25
27
52
@@ -34,9 +36,7 @@
53
34
namespace mgc = mir::graphics::common;
36
namespace mgc = mir::graphics::common;
54
35
namespace geom = mir::geometry;
37
namespace geom = mir::geometry;
55
36
38
59
37
namespace {
39
bool mg::get_gl_pixel_format(MirPixelFormat mir_format,
57
38
58
39
bool get_gl_pixel_format(MirPixelFormat mir_format,
60
40
                         GLenum& gl_format, GLenum& gl_type)
40
                         GLenum& gl_format, GLenum& gl_type)
61
41
{
41
{
62
42
#if __BYTE_ORDER == __LITTLE_ENDIAN
42
#if __BYTE_ORDER == __LITTLE_ENDIAN
63
@@ -84,12 +84,10 @@
64
84
    return gl_format != GL_INVALID_ENUM && gl_type != GL_INVALID_ENUM;
84
    return gl_format != GL_INVALID_ENUM && gl_type != GL_INVALID_ENUM;
65
85
}
85
}
66
86
86
67
87
} // anonymous namespace
68
88
69
89
bool mgc::ShmBuffer::supports(MirPixelFormat mir_format)
87
bool mgc::ShmBuffer::supports(MirPixelFormat mir_format)
70
90
{
88
{
71
91
    GLenum gl_format, gl_type;
89
    GLenum gl_format, gl_type;
73
92
    return get_gl_pixel_format(mir_format, gl_format, gl_type);
90
    return mg::get_gl_pixel_format(mir_format, gl_format, gl_type);
74
93
}
91
}
75
94
92
76
95
mgc::ShmBuffer::ShmBuffer(
93
mgc::ShmBuffer::ShmBuffer(
77
@@ -127,7 +125,7 @@
78
127
{
125
{
79
128
    GLenum format, type;
126
    GLenum format, type;
80
129
127
82
130
    if (get_gl_pixel_format(pixel_format_, format, type))
128
    if (mg::get_gl_pixel_format(pixel_format_, format, type))
83
131
    {
129
    {
84
132
        /*
130
        /*
85
133
         * All existing Mir logic assumes that strides are whole multiples of
131
         * All existing Mir logic assumes that strides are whole multiples of
86
134
132
87
=== modified file 'src/server/CMakeLists.txt'
88
--- src/server/CMakeLists.txt	2017-02-15 07:38:33 +0000
89
+++ src/server/CMakeLists.txt	2017-02-20 13:18:16 +0000
90
@@ -110,6 +110,7 @@
91
110
  mirprotobuf
110
  mirprotobuf
92
111
  mircookie
111
  mircookie
93
112
112
94
113
  server_platform_common
95
113
  ${GLog_LIBRARY}
114
  ${GLog_LIBRARY}
96
114
  ${GFlags_LIBRARY}
115
  ${GFlags_LIBRARY}
97
115
  ${EGL_LDFLAGS} ${EGL_LIBRARIES}
116
  ${EGL_LDFLAGS} ${EGL_LIBRARIES}
98
116
117
99
=== modified file 'src/server/graphics/nested/CMakeLists.txt'
100
--- src/server/graphics/nested/CMakeLists.txt	2017-02-17 07:03:56 +0000
101
+++ src/server/graphics/nested/CMakeLists.txt	2017-02-20 13:18:16 +0000
102
@@ -1,6 +1,7 @@
103
1
include_directories(
1
include_directories(
104
2
  ${PROJECT_SOURCE_DIR}/include/renderers/gl
2
  ${PROJECT_SOURCE_DIR}/include/renderers/gl
105
3
  ${PROJECT_SOURCE_DIR}/include/platforms/mesa
3
  ${PROJECT_SOURCE_DIR}/include/platforms/mesa
106
4
  ${PROJECT_SOURCE_DIR}/include/platforms/common
107
4
)
5
)
108
5
6
109
6
add_library(
7
add_library(
110
7
8
111
=== modified file 'src/server/graphics/nested/buffer.cpp'
112
--- src/server/graphics/nested/buffer.cpp	2017-02-15 07:38:33 +0000
113
+++ src/server/graphics/nested/buffer.cpp	2017-02-20 13:18:16 +0000
114
@@ -21,6 +21,7 @@
115
21
#include "mir/renderer/gl/texture_target.h"
21
#include "mir/renderer/gl/texture_target.h"
116
22
#include "mir/graphics/egl_extensions.h"
22
#include "mir/graphics/egl_extensions.h"
117
23
#include "mir/graphics/buffer_ipc_message.h"
23
#include "mir/graphics/buffer_ipc_message.h"
118
24
#include "mir/graphics/gl_format.h"
119
24
#include "mir_toolkit/mir_buffer.h"
25
#include "mir_toolkit/mir_buffer.h"
120
25
#include "host_connection.h"
26
#include "host_connection.h"
121
26
#include "buffer.h"
27
#include "buffer.h"
122
@@ -47,10 +48,8 @@
123
47
{
48
{
124
48
public:
49
public:
125
49
    TextureAccess(
50
    TextureAccess(
126
50
        mgn::Buffer& buffer,
127
51
        std::shared_ptr<mgn::NativeBuffer> const& native_buffer,
51
        std::shared_ptr<mgn::NativeBuffer> const& native_buffer,
128
52
        std::shared_ptr<mgn::HostConnection> const& connection) :
52
        std::shared_ptr<mgn::HostConnection> const& connection) :
129
53
        buffer(buffer),
130
54
        native_buffer(native_buffer),
53
        native_buffer(native_buffer),
131
55
        connection(connection)
54
        connection(connection)
132
56
    {
55
    {
133
@@ -108,11 +107,9 @@
134
108
        bind();
107
        bind();
135
109
    }
108
    }
136
110
109
139
111
protected:
110
private:
138
112
    mgn::Buffer& buffer;
140
113
    std::shared_ptr<mgn::NativeBuffer> const native_buffer;
111
    std::shared_ptr<mgn::NativeBuffer> const native_buffer;
141
114
    std::shared_ptr<mgn::HostConnection> const connection;
112
    std::shared_ptr<mgn::HostConnection> const connection;
142
115
private:
143
116
    mg::EGLExtensions extensions;
113
    mg::EGLExtensions extensions;
144
117
    typedef std::pair<EGLDisplay, EGLContext> ImageResources;
114
    typedef std::pair<EGLDisplay, EGLContext> ImageResources;
145
118
    typedef std::unique_ptr<EGLImageKHR, std::function<void(EGLImageKHR*)>> EGLImageUPtr;
115
    typedef std::unique_ptr<EGLImageKHR, std::function<void(EGLImageKHR*)>> EGLImageUPtr;
146
@@ -120,17 +117,20 @@
147
120
};
117
};
148
121
118
149
122
class PixelAndTextureAccess :
119
class PixelAndTextureAccess :
152
123
    public TextureAccess,
120
    public mg::NativeBufferBase,
153
124
    public mrs::PixelSource
121
    public mrs::PixelSource,
154
122
    public mrg::TextureSource
155
125
{
123
{
156
126
public:
124
public:
157
127
    PixelAndTextureAccess(
125
    PixelAndTextureAccess(
158
128
        mgn::Buffer& buffer,
126
        mgn::Buffer& buffer,
162
129
        std::shared_ptr<mgn::NativeBuffer> const& native_buffer,
127
        std::shared_ptr<mgn::NativeBuffer> const& native_buffer) :
163
130
        std::shared_ptr<mgn::HostConnection> const& connection) :
128
        buffer(buffer),
164
131
        TextureAccess(buffer, native_buffer, connection),
129
        native_buffer(native_buffer),
165
132
        stride_(geom::Stride{native_buffer->get_graphics_region()->stride})
130
        stride_(geom::Stride{native_buffer->get_graphics_region()->stride})
166
133
    {
131
    {
167
132
        if (!mg::get_gl_pixel_format(buffer.pixel_format(), format, type))
168
133
            BOOST_THROW_EXCEPTION(std::logic_error("buffer cannot be used as texture"));
169
134
    }
134
    }
170
135
135
171
136
    void write(unsigned char const* pixels, size_t pixel_size) override
136
    void write(unsigned char const* pixels, size_t pixel_size) override
172
@@ -163,17 +163,39 @@
173
163
        return stride_;
163
        return stride_;
174
164
    }
164
    }
175
165
165
176
166
    void bind() override
177
167
    {
178
168
        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
179
169
        glTexImage2D(
180
170
            GL_TEXTURE_2D, 0, format,
181
171
            buffer.size().width.as_int(), buffer.size().height.as_int(),
182
172
            0, format, type, native_buffer->get_graphics_region()->vaddr);
183
173
    }
184
174
185
175
    void gl_bind_to_texture() override
186
176
    {
187
177
        bind();
188
178
    }
189
179
190
180
    void secure_for_render() override
191
181
    {
192
182
    }
193
183
194
166
private:
184
private:
195
185
    mgn::Buffer& buffer;
196
186
    std::shared_ptr<mgn::NativeBuffer> const native_buffer;
197
167
    geom::Stride const stride_;
187
    geom::Stride const stride_;
198
188
    GLenum format;
199
189
    GLenum type;
200
168
};
190
};
201
169
}
191
}
202
170
192
203
171
std::shared_ptr<mg::NativeBufferBase> mgn::Buffer::create_native_base(mg::BufferUsage const usage)
193
std::shared_ptr<mg::NativeBufferBase> mgn::Buffer::create_native_base(mg::BufferUsage const usage)
204
172
{
194
{
205
173
    if (usage == mg::BufferUsage::software)
195
    if (usage == mg::BufferUsage::software)
207
174
        return std::make_shared<PixelAndTextureAccess>(*this, buffer, connection);
196
        return std::make_shared<PixelAndTextureAccess>(*this, buffer);
208
175
    else if (usage == mg::BufferUsage::hardware)
197
    else if (usage == mg::BufferUsage::hardware)
210
176
        return std::make_shared<TextureAccess>(*this, buffer, connection);
198
        return std::make_shared<TextureAccess>(buffer, connection);
211
177
    else
199
    else
212
178
        BOOST_THROW_EXCEPTION(std::invalid_argument("usage not supported when creating nested::Buffer"));
200
        BOOST_THROW_EXCEPTION(std::invalid_argument("usage not supported when creating nested::Buffer"));
213
179
}
201
}
214
@@ -192,7 +214,7 @@
215
192
    geom::Size size, uint32_t native_format, uint32_t native_flags) :
214
    geom::Size size, uint32_t native_format, uint32_t native_flags) :
216
193
    connection(connection),
215
    connection(connection),
217
194
    buffer(connection->create_buffer(size, native_format, native_flags)),
216
    buffer(connection->create_buffer(size, native_format, native_flags)),
219
195
    native_base(std::make_shared<TextureAccess>(*this, buffer, connection))
217
    native_base(std::make_shared<TextureAccess>(buffer, connection))
220
196
{
218
{
221
197
}
219
}
222
198
220
223
@@ -202,7 +224,7 @@
224
202
    MirPixelFormat format) :
224
    MirPixelFormat format) :
225
203
    connection(connection),
225
    connection(connection),
226
204
    buffer(connection->create_buffer(size, format)),
226
    buffer(connection->create_buffer(size, format)),
228
205
    native_base(std::make_shared<PixelAndTextureAccess>(*this, buffer, connection))
227
    native_base(std::make_shared<PixelAndTextureAccess>(*this, buffer))
229
206
{
228
{
230
207
}
229
}
231
208
230
232
209
231
233
=== modified file 'src/server/graphics/nested/mir_client_host_connection.cpp'
234
--- src/server/graphics/nested/mir_client_host_connection.cpp	2017-02-17 07:03:56 +0000
235
+++ src/server/graphics/nested/mir_client_host_connection.cpp	2017-02-20 13:18:16 +0000
236
@@ -685,13 +685,10 @@
237
685
    return std::make_unique<SurfaceSpec>(mir_connection);
685
    return std::make_unique<SurfaceSpec>(mir_connection);
238
686
}
686
}
239
687
687
241
688
bool mgn::MirClientHostConnection::supports_passthrough(mg::BufferUsage usage)
688
bool mgn::MirClientHostConnection::supports_passthrough(mg::BufferUsage)
242
689
{
689
{
248
690
    //FIXME: ShmBuffers currently don't upload properly. The logic here uses
690
    return mir_extension_android_buffer_v1(mir_connection) || 
249
691
    //       passthrough where supported (ANativeWindowBuffer and gbm_bo)
691
           mir_extension_gbm_buffer_v1(mir_connection);
245
692
    //       (LP: #1663062 for more details)
246
693
    return (mir_extension_android_buffer_v1(mir_connection) || 
247
694
           ((mir_extension_gbm_buffer_v1(mir_connection) && usage == mg::BufferUsage::hardware)));
250
695
}
692
}
251
696
693
252
697
void mgn::MirClientHostConnection::apply_input_configuration(MirInputConfig const* config)
694
void mgn::MirClientHostConnection::apply_input_configuration(MirInputConfig const* config)
253
698
695
254
=== modified file 'src/server/graphics/nested/platform.cpp'
255
--- src/server/graphics/nested/platform.cpp	2017-02-15 07:38:33 +0000
256
+++ src/server/graphics/nested/platform.cpp	2017-02-20 13:18:16 +0000
257
@@ -75,10 +75,7 @@
258
75
75
259
76
    std::shared_ptr<mg::Buffer> alloc_buffer(mg::BufferProperties const& properties) override
76
    std::shared_ptr<mg::Buffer> alloc_buffer(mg::BufferProperties const& properties) override
260
77
    {
77
    {
265
78
        if (passthrough_candidate(properties.size, properties.usage))
78
        return guest_allocator->alloc_buffer(properties);
262
79
            return std::make_shared<mgn::Buffer>(connection, properties);
263
80
        else
264
81
            return guest_allocator->alloc_buffer(properties);
266
82
    }
79
    }
267
83
80
268
84
    std::shared_ptr<mg::Buffer> alloc_buffer(
81
    std::shared_ptr<mg::Buffer> alloc_buffer(
269
85
82
270
=== modified file 'tests/unit-tests/platforms/nested/test_buffer.cpp'
271
--- tests/unit-tests/platforms/nested/test_buffer.cpp	2017-02-15 07:38:33 +0000
272
+++ tests/unit-tests/platforms/nested/test_buffer.cpp	2017-02-20 13:18:16 +0000
273
@@ -234,6 +234,30 @@
274
234
    texture_source->gl_bind_to_texture();
234
    texture_source->gl_bind_to_texture();
275
235
}
235
}
276
236
236
277
237
TEST_F(NestedBuffer, binds_to_texture_gl_buffer)
278
238
{
279
239
    auto pf = sw_properties.format;
280
240
    auto format = GL_RGBA;
281
241
    auto type = GL_UNSIGNED_BYTE;
282
242
283
243
    mgn::Buffer buffer(mt::fake_shared(mock_connection), size, pf);
284
244
285
245
    auto native_base = buffer.native_buffer_base();
286
246
    ASSERT_THAT(native_base, Ne(nullptr));
287
247
    auto texture_source = dynamic_cast<mir::renderer::gl::TextureSource*>(native_base);
288
248
    ASSERT_THAT(texture_source, Ne(nullptr));
289
249
290
250
    EXPECT_CALL(mock_egl, glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, _))
291
251
        .Times(0);
292
252
293
253
    EXPECT_CALL(mock_gl, glPixelStorei(GL_UNPACK_ALIGNMENT, 1));
294
254
    EXPECT_CALL(mock_gl, glTexImage2D(
295
255
            GL_TEXTURE_2D, 0, format,
296
256
            buffer.size().width.as_int(), buffer.size().height.as_int(),
297
257
            0, format, type, _));
298
258
    texture_source->gl_bind_to_texture();
299
259
}
300
260
301
237
TEST_F(NestedBuffer, just_makes_one_bind_per_display_context_pair)
261
TEST_F(NestedBuffer, just_makes_one_bind_per_display_context_pair)
302
238
{
262
{
303
239
    ON_CALL(*client_buffer, egl_image_creation_hints())
263
    ON_CALL(*client_buffer, egl_image_creation_hints())
Reviewer	Review Type	Date Requested	Status
Daniel van Vugt			Approve on 2017-02-21
Mir CI Bot	continuous-integration		Approve on 2017-02-20
Brandon Schaefer (community)		2017-02-14	Approve on 2017-02-15
Review via email: mp+317247@code.launchpad.net