1
=== modified file 'src/platforms/mesa/server/x11/graphics/display.cpp'
2
--- src/platforms/mesa/server/x11/graphics/display.cpp	2016-06-02 05:33:50 +0000
3
+++ src/platforms/mesa/server/x11/graphics/display.cpp	2016-06-09 14:11:22 +0000
4
@@ -21,6 +21,7 @@
5
21
#include "mir/graphics/egl_resources.h"
21
#include "mir/graphics/egl_resources.h"
6
22
#include "mir/graphics/egl_error.h"
22
#include "mir/graphics/egl_error.h"
7
23
#include "mir/graphics/virtual_output.h"
23
#include "mir/graphics/virtual_output.h"
8
24
#include "mir/graphics/gl_config.h"
9
24
#include "display_configuration.h"
25
#include "display_configuration.h"
10
25
#include "display.h"
26
#include "display.h"
11
26
#include "display_buffer.h"
27
#include "display_buffer.h"
12
@@ -60,7 +61,10 @@
13
60
    return egl_dpy;
61
    return egl_dpy;
14
61
}
62
}
15
62
63
17
63
mgx::X11Window::X11Window(::Display* x_dpy, EGLDisplay egl_dpy, geom::Size const size)
64
mgx::X11Window::X11Window(::Display* x_dpy,
18
65
                          EGLDisplay egl_dpy,
19
66
                          geom::Size const size,
20
67
                          GLConfig const& gl_config)
21
64
    : x_dpy{x_dpy}
68
    : x_dpy{x_dpy}
22
65
{
69
{
23
66
    EGLint const att[] = {
70
    EGLint const att[] = {
24
@@ -69,8 +73,8 @@
25
69
        EGL_GREEN_SIZE, 8,
73
        EGL_GREEN_SIZE, 8,
26
70
        EGL_BLUE_SIZE, 8,
74
        EGL_BLUE_SIZE, 8,
27
71
        EGL_ALPHA_SIZE, 8,
75
        EGL_ALPHA_SIZE, 8,
30
72
        EGL_DEPTH_SIZE, 0,
76
        EGL_DEPTH_SIZE, gl_config.depth_buffer_bits(),
31
73
        EGL_STENCIL_SIZE, 0,
77
        EGL_STENCIL_SIZE, gl_config.stencil_buffer_bits(),
32
74
        EGL_RENDERABLE_TYPE, MIR_SERVER_EGL_OPENGL_BIT,
78
        EGL_RENDERABLE_TYPE, MIR_SERVER_EGL_OPENGL_BIT,
33
75
        EGL_NONE
79
        EGL_NONE
34
76
    };
80
    };
35
@@ -242,12 +246,15 @@
36
242
    return egl_surf;
246
    return egl_surf;
37
243
}
247
}
38
244
248
40
245
mgx::Display::Display(::Display* x_dpy, geom::Size const size)
249
mgx::Display::Display(::Display* x_dpy,
41
250
                      geom::Size const size,
42
251
                      GLConfig const& gl_config)
43
246
    : egl_display{X11EGLDisplay(x_dpy)},
252
    : egl_display{X11EGLDisplay(x_dpy)},
44
247
      size{size},
253
      size{size},
45
248
      win{X11Window(x_dpy,
254
      win{X11Window(x_dpy,
46
249
                    egl_display,
255
                    egl_display,
48
250
                    size)},
256
                    size,
49
257
                    gl_config)},
50
251
      egl_context{X11EGLContext(egl_display,
258
      egl_context{X11EGLContext(egl_display,
51
252
                                win.egl_config())},
259
                                win.egl_config())},
52
253
      egl_surface{X11EGLSurface(egl_display,
260
      egl_surface{X11EGLSurface(egl_display,
53
254
261
54
=== modified file 'src/platforms/mesa/server/x11/graphics/display.h'
55
--- src/platforms/mesa/server/x11/graphics/display.h	2016-04-22 02:39:57 +0000
56
+++ src/platforms/mesa/server/x11/graphics/display.h	2016-06-09 14:11:22 +0000
57
@@ -32,6 +32,9 @@
58
32
{
32
{
59
33
namespace graphics
33
namespace graphics
60
34
{
34
{
61
35
62
36
class GLConfig;
63
37
64
35
namespace X
38
namespace X
65
36
{
39
{
66
37
40
67
@@ -50,7 +53,10 @@
68
50
class X11Window
53
class X11Window
69
51
{
54
{
70
52
public:
55
public:
72
53
    X11Window(::Display* const x_dpy, EGLDisplay egl_dpy, mir::geometry::Size const size);
56
    X11Window(::Display* const x_dpy,
73
57
              EGLDisplay egl_dpy,
74
58
              geometry::Size const size,
75
59
              GLConfig const& gl_config);
76
54
    ~X11Window();
60
    ~X11Window();
77
55
61
78
56
    operator Window() const;
62
    operator Window() const;
79
@@ -93,7 +99,9 @@
80
93
class Display : public graphics::Display
99
class Display : public graphics::Display
81
94
{
100
{
82
95
public:
101
public:
84
96
    explicit Display(::Display* x_dpy, mir::geometry::Size const size);
102
    explicit Display(::Display* x_dpy,
85
103
                     geometry::Size const size,
86
104
                     GLConfig const& gl_config);
87
97
    ~Display() noexcept;
105
    ~Display() noexcept;
88
98
106
89
99
    void for_each_display_sync_group(std::function<void(graphics::DisplaySyncGroup&)> const& f) override;
107
    void for_each_display_sync_group(std::function<void(graphics::DisplaySyncGroup&)> const& f) override;
90
@@ -129,6 +137,7 @@
91
129
};
137
};
92
130
138
93
131
}
139
}
94
140
95
132
}
141
}
96
133
}
142
}
97
134
#endif /* MIR_GRAPHICS_X_DISPLAY_H_ */
143
#endif /* MIR_GRAPHICS_X_DISPLAY_H_ */
98
135
144
99
=== modified file 'src/platforms/mesa/server/x11/graphics/platform.cpp'
100
--- src/platforms/mesa/server/x11/graphics/platform.cpp	2016-01-29 08:18:22 +0000
101
+++ src/platforms/mesa/server/x11/graphics/platform.cpp	2016-06-09 14:11:22 +0000
102
@@ -46,9 +46,9 @@
103
46
46
104
47
mir::UniqueModulePtr<mg::Display> mgx::Platform::create_display(
47
mir::UniqueModulePtr<mg::Display> mgx::Platform::create_display(
105
48
    std::shared_ptr<DisplayConfigurationPolicy> const& /*initial_conf_policy*/,
48
    std::shared_ptr<DisplayConfigurationPolicy> const& /*initial_conf_policy*/,
107
49
    std::shared_ptr<GLConfig> const& /*gl_config*/)
49
    std::shared_ptr<GLConfig> const& gl_config)
108
50
{
50
{
110
51
    return make_module_ptr<mgx::Display>(x11_connection.get(), size);
51
    return make_module_ptr<mgx::Display>(x11_connection.get(), size, *gl_config);
111
52
}
52
}
112
53
53
113
54
mir::UniqueModulePtr<mg::PlatformIpcOperations> mgx::Platform::make_ipc_operations() const
54
mir::UniqueModulePtr<mg::PlatformIpcOperations> mgx::Platform::make_ipc_operations() const
114
55
55
115
=== modified file 'tests/unit-tests/graphics/mesa/x11/test_display.cpp'
116
--- tests/unit-tests/graphics/mesa/x11/test_display.cpp	2016-01-29 08:18:22 +0000
117
+++ tests/unit-tests/graphics/mesa/x11/test_display.cpp	2016-06-09 14:11:22 +0000
118
@@ -22,6 +22,7 @@
119
22
#include "src/platforms/mesa/server/x11/graphics/display.h"
22
#include "src/platforms/mesa/server/x11/graphics/display.h"
120
23
#include "mir/test/doubles/mock_egl.h"
23
#include "mir/test/doubles/mock_egl.h"
121
24
#include "mir/test/doubles/mock_x11.h"
24
#include "mir/test/doubles/mock_x11.h"
122
25
#include "mir/test/doubles/mock_gl_config.h"
123
25
26
124
26
namespace mg=mir::graphics;
27
namespace mg=mir::graphics;
125
27
namespace mgx=mg::X;
28
namespace mgx=mg::X;
126
@@ -78,11 +79,15 @@
127
78
79
128
79
    std::shared_ptr<mgx::Display> create_display()
80
    std::shared_ptr<mgx::Display> create_display()
129
80
    {
81
    {
131
81
        return std::make_shared<mgx::Display>(mock_x11.fake_x11.display, size);
82
        return std::make_shared<mgx::Display>(
132
83
                   mock_x11.fake_x11.display,
133
84
                   size,
134
85
                   mock_gl_config);
135
82
    }
86
    }
136
83
87
137
84
    ::testing::NiceMock<mtd::MockEGL> mock_egl;
88
    ::testing::NiceMock<mtd::MockEGL> mock_egl;
138
85
    ::testing::NiceMock<mtd::MockX11> mock_x11;
89
    ::testing::NiceMock<mtd::MockX11> mock_x11;
139
90
    mtd::MockGLConfig mock_gl_config;
140
86
};
91
};
141
87
92
142
88
}
93
}
143
@@ -111,3 +116,28 @@
144
111
116
145
112
    auto display = create_display();
117
    auto display = create_display();
146
113
}
118
}
147
119
148
120
TEST_F(X11DisplayTest, respects_gl_config)
149
121
{
150
122
    using namespace testing;
151
123
152
124
    EGLint const depth_bits{24};
153
125
    EGLint const stencil_bits{8};
154
126
155
127
    EXPECT_CALL(mock_gl_config, depth_buffer_bits())
156
128
        .Times(AtLeast(1))
157
129
        .WillRepeatedly(Return(depth_bits));
158
130
    EXPECT_CALL(mock_gl_config, stencil_buffer_bits())
159
131
        .Times(AtLeast(1))
160
132
        .WillRepeatedly(Return(stencil_bits));
161
133
162
134
    EXPECT_CALL(mock_egl,
163
135
                eglChooseConfig(
164
136
                    _,
165
137
                    AllOf(mtd::EGLConfigContainsAttrib(EGL_DEPTH_SIZE, depth_bits),
166
138
                          mtd::EGLConfigContainsAttrib(EGL_STENCIL_SIZE, stencil_bits)),
167
139
                    _,_,_))
168
140
        .Times(AtLeast(1));
169
141
170
142
    auto display = create_display();
171
143
}
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-06-11
Kevin DuBois (community)		2016-06-08	Approve on 2016-06-10
Review via email: mp+296877@code.launchpad.net