1
=== modified file 'src/platforms/mesa/client/client_platform.cpp'
2
--- src/platforms/mesa/client/client_platform.cpp	2017-04-13 07:00:27 +0000
3
+++ src/platforms/mesa/client/client_platform.cpp	2017-05-01 09:59:05 +0000
4
@@ -151,12 +151,7 @@
5
151
        available_callback, available_context);
151
        available_callback, available_context);
6
152
}
152
}
7
153
153
14
154
MirBuffer* allocate_buffer_gbm_sync(
154
namespace
9
155
    MirConnection* connection,
10
156
    uint32_t width, uint32_t height,
11
157
    uint32_t gbm_pixel_format,
12
158
    uint32_t gbm_bo_flags)
13
159
try
15
160
{
155
{
16
161
    struct BufferSync
156
    struct BufferSync
17
162
    {
157
    {
18
@@ -177,11 +172,25 @@
19
177
        std::mutex mutex;
172
        std::mutex mutex;
20
178
        std::condition_variable cv;
173
        std::condition_variable cv;
21
179
        MirBuffer* buffer = nullptr;
174
        MirBuffer* buffer = nullptr;
24
180
    } sync;
175
    };
25
181
176
26
177
    void allocate_buffer_gbm_sync_cb(MirBuffer* b, void* context)
27
178
    {
28
179
        reinterpret_cast<BufferSync*>(context)->set_buffer(b);
29
180
    }
30
181
}
31
182
32
183
MirBuffer* allocate_buffer_gbm_sync(
33
184
    MirConnection* connection,
34
185
    uint32_t width, uint32_t height,
35
186
    uint32_t gbm_pixel_format,
36
187
    uint32_t gbm_bo_flags)
37
188
try
38
189
{
39
190
    BufferSync sync;
40
182
    allocate_buffer_gbm(
191
    allocate_buffer_gbm(
41
183
        connection, width, height, gbm_pixel_format, gbm_bo_flags,
192
        connection, width, height, gbm_pixel_format, gbm_bo_flags,
43
184
        [](auto* b, auto* context){ reinterpret_cast<BufferSync*>(context)->set_buffer(b); }, &sync);
193
        &allocate_buffer_gbm_sync_cb, &sync);
44
185
    return sync.wait_for_buffer();
194
    return sync.wait_for_buffer();
45
186
}
195
}
46
187
catch (...)
196
catch (...)
47
188
197
48
=== modified file 'src/platforms/mesa/server/kms/display.cpp'
49
--- src/platforms/mesa/server/kms/display.cpp	2017-04-06 05:30:53 +0000
50
+++ src/platforms/mesa/server/kms/display.cpp	2017-05-01 09:59:05 +0000
51
@@ -557,8 +557,8 @@
52
557
                    bounding_rect.size.height.as_uint32_t()};
557
                    bounding_rect.size.height.as_uint32_t()};
53
558
558
54
559
                auto const physical_size = transformation * logical_size;
559
                auto const physical_size = transformation * logical_size;
57
560
                uint32_t width = abs(physical_size.x);
560
                uint32_t width = abs(int(physical_size.x));
58
561
                uint32_t height = abs(physical_size.y);
561
                uint32_t height = abs(int(physical_size.y));
59
562
562
60
563
                for (auto const& group : kms_output_groups)
563
                for (auto const& group : kms_output_groups)
61
564
                {
564
                {
62
565
565
63
=== modified file 'tests/unit-tests/platforms/nested/test_host_buffer.cpp'
64
--- tests/unit-tests/platforms/nested/test_host_buffer.cpp	2017-04-13 07:00:27 +0000
65
+++ tests/unit-tests/platforms/nested/test_host_buffer.cpp	2017-05-01 09:59:05 +0000
66
@@ -36,6 +36,9 @@
67
36
namespace mcl = mir::client;
36
namespace mcl = mir::client;
68
37
namespace mtd = mir::test::doubles;
37
namespace mtd = mir::test::doubles;
69
38
38
70
39
namespace
71
40
{
72
41
73
39
std::unique_ptr<mir::Fd> fd = nullptr;
42
std::unique_ptr<mir::Fd> fd = nullptr;
74
40
int get_fence(MirBuffer*)
43
int get_fence(MirBuffer*)
75
41
{
44
{
76
@@ -44,6 +47,10 @@
77
44
    return -1;
47
    return -1;
78
45
}
48
}
79
46
49
80
50
void null_connected_callback(MirConnection*, void*)
81
51
{
82
52
}
83
53
84
47
struct TestConnectionConfiguration : mir::client::DefaultConnectionConfiguration
54
struct TestConnectionConfiguration : mir::client::DefaultConnectionConfiguration
85
48
{
55
{
86
49
public:
56
public:
87
@@ -110,6 +117,8 @@
88
110
    }
117
    }
89
111
};
118
};
90
112
119
91
120
}
92
121
93
113
struct HostBuffer : Test
122
struct HostBuffer : Test
94
114
{
123
{
95
115
    HostBuffer()
124
    HostBuffer()
96
@@ -133,7 +142,7 @@
97
133
    fd = std::make_unique<mir::Fd>( fileno(tmpfile()) );
142
    fd = std::make_unique<mir::Fd>( fileno(tmpfile()) );
98
134
143
99
135
    MirConnection connection{*config};
144
    MirConnection connection{*config};
101
136
    connection.connect("", [](auto*, auto*){}, nullptr)->wait_for_all();
145
    connection.connect("", &null_connected_callback, nullptr)->wait_for_all();
102
137
    mgn::HostBuffer buffer(&connection, mir::geometry::Size{1,1}, mir_pixel_format_abgr_8888);
146
    mgn::HostBuffer buffer(&connection, mir::geometry::Size{1,1}, mir_pixel_format_abgr_8888);
103
138
    {
147
    {
104
139
        auto fence = buffer.fence();
148
        auto fence = buffer.fence();
Status:	Merged
Approved by:	Daniel van Vugt on 2017-05-03
Approved revision:	no longer in the source branch.
Merged at revision:	4163
Proposed branch:	lp:~vanvugt/mir/make-older-clang-happy
Merge into:	lp:mir
Diff against target:	104 lines (+30/-12) 3 files modified src/platforms/mesa/client/client_platform.cpp (+18/-9) src/platforms/mesa/server/kms/display.cpp (+2/-2) tests/unit-tests/platforms/nested/test_host_buffer.cpp (+10/-1)
To merge this branch:	bzr merge lp:~vanvugt/mir/make-older-clang-happy
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Andreas Pokorny (community)			Approve on 2017-05-03
Mir CI Bot	continuous-integration		Approve on 2017-05-01
Mir development team		2017-05-01	Pending
Review via email: mp+323456@code.launchpad.net