Merge into development-branch : tidy-mir_buffer_egl_image

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

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-11-08:

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2123/rebuild

PASSED: Continuous integration, rev:3811
https://mir-jenkins.ubuntu.com/job/mir-ci/2123/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2743
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2806
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2798
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2798
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2798
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2772
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2772/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2772
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2772/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2772
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2772/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2772
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2772/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2772
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2772/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2772
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2772/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2123/rebuild

review: Approve (continuous-integration)

Revision history for this message

Kevin DuBois (kdub) wrote on 2016-11-08:

#

The api should be going away soon, once there's an EGL mir platform.
+ // TODO: check return value
why not check now?

review: Approve

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-11-09:

#

I had to draw the line somewhere. It was too messy to rework the internal bits and it was already past EOD, and tidying the internals is less of a pressing issue than getting the public side right.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-11-09:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-11-09:

#

^^^
Bug 1640366

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-11-09:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-11-09:

#

^^^
Bug 1616312 and bug 1613523

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-11-09:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-11-09:

#

^^^
Temporary failure resolving 'ports.ubuntu.com'

Revision history for this message

Mir CI Bot (mir-ci-bot) on 2016-11-09:

#

review: Approve (continuous-integration)

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	return nullptr;
6	}
7
8	-void mir_buffer_egl_image_parameters(
9	+bool mir_buffer_get_egl_image_parameters(
10	MirBuffer* b, EGLenum* type, EGLClientBuffer* client_buffer, EGLint** attr)
11	try
12	{
13	@@ -231,8 +231,10 @@
14	mir::require(attr);
15	auto buffer = reinterpret_cast<mcl::Buffer*>(b);
16	buffer->client_buffer()->egl_image_creation_parameters(type, client_buffer, attr);
17	+ return true;
18	}
19	catch (std::exception const& ex)
20	{
21	MIR_LOG_UNCAUGHT_EXCEPTION(ex);
22	+ return false;
23	}
24
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
30	#private functions needed temporarily by nested passthrough
31	#should not be published along with the rest of the NBS symbols
32	- mir_buffer_egl_image_parameters;
33	+ mir_buffer_get_egl_image_parameters;
34	mir_presentation_chain_set_queueing_mode;
35	mir_presentation_chain_set_dropping_mode;
36	local:
37
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	* \param [out] target The target to use
43	* \param [out] client_buffer The EGLClientBuffer to use
44	* \param [out] attrs The attributes to use
45	+ * \returns True if valid parameters could be found
46	**/
47	-void mir_buffer_egl_image_parameters(
48	+bool mir_buffer_get_egl_image_parameters(
49	MirBuffer* buffer,
50	EGLenum* target,
51	EGLClientBuffer* client_buffer,
52
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	EGLenum type;
58	EGLClientBuffer client_buffer = nullptr;;
59	EGLint* attrs = nullptr;
60	- mir_buffer_egl_image_parameters(handle, &type, &client_buffer, &attrs);
61	+ // TODO: check return value
62	+ mir_buffer_get_egl_image_parameters(handle, &type, &client_buffer, &attrs);
63
64	return std::tuple<EGLenum, EGLClientBuffer, EGLint*>{type, client_buffer, attrs};
65	}

Mir

Merge lp:~vanvugt/mir/tidy-mir_buffer_egl_image_parameters into lp:mir

Commit message

Description of the change

Preview Diff

Subscribers