Mir

Merge lp://qastaging/~afrantzis/mir/one-gl-prefix-is-enough into lp://qastaging/mir

one-gl-prefix-is-enough
Merge into development-branch

Proposed by Alexandros Frantzis on 2015-09-11

Status:	Merged
Approved by:	Alexandros Frantzis on 2015-09-14
Approved revision:	no longer in the source branch.
Merged at revision:	2930
Proposed branch:	lp://qastaging/~afrantzis/mir/one-gl-prefix-is-enough
Merge into:	lp://qastaging/mir
Diff against target:	579 lines (+83/-81) 16 files modified playground/CMakeLists.txt (+1/-1) playground/demo-shell/demo_renderer.cpp (+6/-5) playground/demo-shell/demo_renderer.h (+3/-3) src/renderers/gl/CMakeLists.txt (+3/-3) src/renderers/gl/program_family.cpp (+4/-4) src/renderers/gl/program_family.h (+9/-9) src/renderers/gl/renderer.cpp (+14/-14) src/renderers/gl/renderer.h (+11/-11) src/renderers/gl/renderer_factory.cpp (+4/-4) src/renderers/gl/renderer_factory.h (+3/-3) src/server/compositor/CMakeLists.txt (+2/-1) src/server/compositor/default_configuration.cpp (+2/-2) src/server/symbols.map (+13/-13) tests/integration-tests/test_surface_stack_with_compositor.cpp (+1/-1) tests/unit-tests/renderers/gl/test_gl_program_family.cpp (+2/-2) tests/unit-tests/renderers/gl/test_gl_renderer.cpp (+5/-5)
To merge this branch:	bzr merge lp://qastaging/~afrantzis/mir/one-gl-prefix-is-enough
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2015-09-11	Approve on 2015-09-14
Daniel van Vugt			Needs Information on 2015-09-14
Alan Griffiths		2015-09-11	Approve on 2015-09-11
Kevin DuBois		2015-09-11	Pending
Review via email: mp+270805@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2015-09-11.

Commit message

renderers: Remove redundant GL prefix from gl renderer classes

Description of the change

renderers: Remove redundant GL prefix from gl renderer classes

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-10: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4854/rebuild

review: Approve (continuous-integration)

Revision history for this message

Kevin DuBois (kdub) wrote on 2015-09-10: Posted in a previous version of this proposal

lgtm, apart from the conflicts

review: Approve

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2015-09-11: Posted in a previous version of this proposal

Managed to confuse bzr with all the criss-cross merges... I have resubmitted from a clean branch (i.e. based on current lp:mir).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-11: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2922
http://jenkins.qa.ubuntu.com/job/mir-ci/4868/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3924/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2829/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3868/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1017/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3868/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4868/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-09-11: Posted in a previous version of this proposal

LGTM

review: Approve

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-09-11: Posted in a previous version of this proposal

> LGTM

Actually, no.

- gl_program_family.cpp
- gl_renderer.cpp
- gl_renderer_factory.cpp
+ program_family.cpp
+ renderer.cpp
+ renderer_factory.cpp

These files are not renamed

review: Needs Fixing

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2015-09-11:

> These files are not renamed

Fixed.

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-09-11:

LGTM

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4876/rebuild

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-09-14:

Reduced redundancy is good.

However there still remains redundancy that needs addressing:

mir::renderer::gl::Renderer::

I'm remember GL before it meant OpenGL. So for a time "GL" was the generic term for "the graphics library" but not "which graphics library". I know that common interpretation is long dead, but it seems we now need some generic term again. In recent conversations I called it "the graphics language" but that's too wordy.

Arguably OpenGL is now a "platform" for renderers and such. You don't need to mention the word "platform", so maybe (as a later proposal):

mir::gl::Renderer::

Approved. But "Needs Information" because I would like to see more improvement.

review: Needs Information

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2015-09-14:

review: Approve (continuous-integration)