Merge lp://qastaging/~3v1n0/compiz/msaa-configs-ignore-egl into lp://qastaging/compiz/0.9.10

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3701
Merged at revision: 3704
Proposed branch: lp://qastaging/~3v1n0/compiz/msaa-configs-ignore-egl
Merge into: lp://qastaging/compiz/0.9.10
Prerequisite: lp://qastaging/~3v1n0/compiz/msaa-configs-ignore
Diff against target: 42 lines (+23/-7)
1 file modified
plugins/opengl/src/screen.cpp (+23/-7)
To merge this branch: bzr merge lp://qastaging/~3v1n0/compiz/msaa-configs-ignore-egl
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
PS Jenkins bot (community) continuous-integration Approve
MC Return Approve
Review via email: mp+163567@code.qastaging.launchpad.net

Commit message

OpenGLES Screen: Ignore the MSAA configs during initialization

Description of the change

Ignore MSAA configs in EGL initialization, as done in lp:~3v1n0/compiz/msaa-configs-ignore

To post a comment you must log in.
Revision history for this message
MC Return (mc-return) wrote :

LGTM. +1

Thanks for switching to prefix also :)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

/tmp/buildd/compiz-0.9.10/plugins/opengl/src/screen.cpp: In member function 'bool GLScreen::glInitContext(XVisualInfo*)':
/tmp/buildd/compiz-0.9.10/plugins/opengl/src/screen.cpp:439:60: error: 'val' was not declared in this scope

You'll need to re-declare EGLint val;

review: Needs Fixing
3701. By Marco Trevisan (Treviño)

GLScreen: add val delcaration back

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Ops, sorry... I've wrongly removed that line. Fixed now ;)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Thanks, +1.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches