1
=== modified file 'src/client/mir_buffer_api.cpp'
2
--- src/client/mir_buffer_api.cpp	2016-10-12 06:03:15 +0000
3
+++ src/client/mir_buffer_api.cpp	2016-11-08 09:10:54 +0000
4
@@ -221,7 +221,7 @@
5
221
    return nullptr;
221
    return nullptr;
6
222
}
222
}
7
223
223
9
224
void mir_buffer_egl_image_parameters(
224
bool mir_buffer_get_egl_image_parameters(
10
225
    MirBuffer* b, EGLenum* type, EGLClientBuffer* client_buffer, EGLint** attr)
225
    MirBuffer* b, EGLenum* type, EGLClientBuffer* client_buffer, EGLint** attr)
11
226
try
226
try
12
227
{
227
{
13
@@ -231,8 +231,10 @@
14
231
    mir::require(attr);
231
    mir::require(attr);
15
232
    auto buffer = reinterpret_cast<mcl::Buffer*>(b);
232
    auto buffer = reinterpret_cast<mcl::Buffer*>(b);
16
233
    buffer->client_buffer()->egl_image_creation_parameters(type, client_buffer, attr);
233
    buffer->client_buffer()->egl_image_creation_parameters(type, client_buffer, attr);
17
234
    return true;
18
234
}
235
}
19
235
catch (std::exception const& ex)
236
catch (std::exception const& ex)
20
236
{
237
{
21
237
    MIR_LOG_UNCAUGHT_EXCEPTION(ex);
238
    MIR_LOG_UNCAUGHT_EXCEPTION(ex);
22
239
    return false;
23
238
}
240
}
24
239
241
25
=== modified file 'src/client/symbols.map'
26
--- src/client/symbols.map	2016-11-08 00:46:03 +0000
27
+++ src/client/symbols.map	2016-11-08 09:10:54 +0000
28
@@ -395,7 +395,7 @@
29
395
395
30
396
    #private functions needed temporarily by nested passthrough
396
    #private functions needed temporarily by nested passthrough
31
397
    #should not be published along with the rest of the NBS symbols
397
    #should not be published along with the rest of the NBS symbols
33
398
    mir_buffer_egl_image_parameters;
398
    mir_buffer_get_egl_image_parameters;
34
399
    mir_presentation_chain_set_queueing_mode;
399
    mir_presentation_chain_set_queueing_mode;
35
400
    mir_presentation_chain_set_dropping_mode;
400
    mir_presentation_chain_set_dropping_mode;
36
401
  local:
401
  local:
37
402
402
38
=== modified file 'src/include/client/mir_toolkit/mir_buffer_private.h'
39
--- src/include/client/mir_toolkit/mir_buffer_private.h	2016-10-11 11:58:36 +0000
40
+++ src/include/client/mir_toolkit/mir_buffer_private.h	2016-11-08 09:10:54 +0000
41
@@ -59,8 +59,9 @@
42
59
 *   \param [out] target        The target to use
59
 *   \param [out] target        The target to use
43
60
 *   \param [out] client_buffer The EGLClientBuffer to use 
60
 *   \param [out] client_buffer The EGLClientBuffer to use 
44
61
 *   \param [out] attrs         The attributes to use
61
 *   \param [out] attrs         The attributes to use
45
62
 *   \returns                   True if valid parameters could be found
46
62
 **/
63
 **/
48
63
void mir_buffer_egl_image_parameters(
64
bool mir_buffer_get_egl_image_parameters(
49
64
    MirBuffer* buffer,
65
    MirBuffer* buffer,
50
65
    EGLenum* target,
66
    EGLenum* target,
51
66
    EGLClientBuffer* client_buffer,
67
    EGLClientBuffer* client_buffer,
52
67
68
53
=== modified file 'src/server/graphics/nested/mir_client_host_connection.cpp'
54
--- src/server/graphics/nested/mir_client_host_connection.cpp	2016-11-01 12:42:09 +0000
55
+++ src/server/graphics/nested/mir_client_host_connection.cpp	2016-11-08 09:10:54 +0000
56
@@ -571,7 +571,8 @@
57
571
        EGLenum type;
571
        EGLenum type;
58
572
        EGLClientBuffer client_buffer = nullptr;;
572
        EGLClientBuffer client_buffer = nullptr;;
59
573
        EGLint* attrs = nullptr;
573
        EGLint* attrs = nullptr;
61
574
        mir_buffer_egl_image_parameters(handle, &type, &client_buffer, &attrs);
574
        // TODO: check return value
62
575
        mir_buffer_get_egl_image_parameters(handle, &type, &client_buffer, &attrs);
63
575
        
576
        
64
576
        return std::tuple<EGLenum, EGLClientBuffer, EGLint*>{type, client_buffer, attrs};
577
        return std::tuple<EGLenum, EGLClientBuffer, EGLint*>{type, client_buffer, attrs};
65
577
    }
578
    }
Status:	Merged
Approved by:	Daniel van Vugt on 2016-11-09
Approved revision:	no longer in the source branch.
Merged at revision:	3814
Proposed branch:	lp:~vanvugt/mir/tidy-mir_buffer_egl_image_parameters
Merge into:	lp:mir
Diff against target:	65 lines (+8/-4) 4 files modified src/client/mir_buffer_api.cpp (+3/-1) src/client/symbols.map (+1/-1) src/include/client/mir_toolkit/mir_buffer_private.h (+2/-1) src/server/graphics/nested/mir_client_host_connection.cpp (+2/-1)
To merge this branch:	bzr merge lp:~vanvugt/mir/tidy-mir_buffer_egl_image_parameters
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-11-09
Kevin DuBois (community)		2016-11-08	Approve on 2016-11-08
Review via email: mp+310262@code.launchpad.net