Merge lp://qastaging/~bitzesmichail/compiz/wizardGLES into lp://qastaging/compiz/0.9.10

Proposed by Michail Bitzes
Status: Merged
Approved by: MC Return
Approved revision: 3754
Merged at revision: 3756
Proposed branch: lp://qastaging/~bitzesmichail/compiz/wizardGLES
Merge into: lp://qastaging/compiz/0.9.10
Diff against target: 508 lines (+204/-165)
5 files modified
debian/compiz-plugins.install.armel (+1/-0)
debian/compiz-plugins.install.armhf (+1/-0)
plugins/CMakeLists.txt (+0/-1)
plugins/wizard/include/wizard.h (+14/-9)
plugins/wizard/src/wizard.cpp (+188/-155)
To merge this branch: bzr merge lp://qastaging/~bitzesmichail/compiz/wizardGLES
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
MC Return Approve
Review via email: mp+173358@code.qastaging.launchpad.net

Commit message

Plugin wizard ported to OpenGL|ES.

Use GLVertexBuffer.
Enable building for GLES. Enable architectures armel and armhf.

(LP: #1196003)

Description of the change

Just the OpenGL|ES port. Bug #1195996 not fixed in this branch.

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

Hey Michail !

LGTM @ a first glance. I will test this ASAP (on OpenGL hw). :)
But knowing you, I'm sure it is perfect ;)

The merge of this might take a while though, as the release of 0.9.10.0 gets prepared currently...

Revision history for this message
MC Return (mc-return) wrote :

This is now tested and worx perfectly as expected. :)
+1

review: Approve
Revision history for this message
MC Return (mc-return) wrote :

Andyrock told me trunk is unblocked, so this can still make it to 0.9.10.0 it seems. :)

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

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