Unity

Merge lp:~linaro-graphics-wg/unity/gles2-compizfbo-namespace into lp:unity

  1. gles2-compizfbo-namespace
  2. Merge into trunk
Proposed by Alexandros Frantzis
Status: Merged
Approved by: Jay Taoko
Approved revision: no longer in the source branch.
Merged at revision: 2137
Proposed branch: lp:~linaro-graphics-wg/unity/gles2-compizfbo-namespace
Merge into: lp:unity
Diff against target: 48 lines (+5/-5)
2 files modified
plugins/unityshell/src/unityshell.cpp (+3/-3)
plugins/unityshell/src/unityshell.h (+2/-2)
To merge this branch: bzr merge lp:~linaro-graphics-wg/unity/gles2-compizfbo-namespace
Reviewer Review Type Date Requested Status
Jay Taoko (community) Approve
Review via email: mp+97847@code.launchpad.net

Commit message

gles2: Reference compiz's GLFramebufferObject class using a global namespace.

We need to do this to differentiate from the class of the same name provided
in the Nux namespace.

Description of the change

gles2: Reference compiz's GLFramebufferObject class using a global namespace.

We need to do this to differentiate from the class of the same name provided
in the Nux namespace.

To post a comment you must log in.
Revision history for this message
Jay Taoko (jaytaoko) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp 2012-03-14 13:05:59 +0000
+++ plugins/unityshell/src/unityshell.cpp 2012-03-16 11:34:42 +0000
@@ -1231,7 +1231,7 @@
12311231
1232#ifdef USE_GLES1232#ifdef USE_GLES
1233void UnityScreen::glPaintCompositedOutput (const CompRegion &region,1233void UnityScreen::glPaintCompositedOutput (const CompRegion &region,
1234 GLFramebufferObject *fbo,1234 ::GLFramebufferObject *fbo,
1235 unsigned int mask)1235 unsigned int mask)
1236{1236{
1237 bool useFbo = false;1237 bool useFbo = false;
@@ -1242,11 +1242,11 @@
1242 useFbo = fbo->checkStatus () && fbo->tex ();1242 useFbo = fbo->checkStatus () && fbo->tex ();
1243 if (!useFbo) {1243 if (!useFbo) {
1244 printf ("bailing from UnityScreen::glPaintCompositedOutput");1244 printf ("bailing from UnityScreen::glPaintCompositedOutput");
1245 GLFramebufferObject::rebind (oldFbo);1245 ::GLFramebufferObject::rebind (oldFbo);
1246 return;1246 return;
1247 }1247 }
1248 paintDisplay();1248 paintDisplay();
1249 GLFramebufferObject::rebind (oldFbo);1249 ::GLFramebufferObject::rebind (oldFbo);
1250 }1250 }
12511251
1252 gScreen->glPaintCompositedOutput(region, fbo, mask);1252 gScreen->glPaintCompositedOutput(region, fbo, mask);
12531253
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h 2012-03-13 12:13:08 +0000
+++ plugins/unityshell/src/unityshell.h 2012-03-16 11:34:42 +0000
@@ -163,7 +163,7 @@
163 unsigned int);163 unsigned int);
164#ifdef USE_GLES164#ifdef USE_GLES
165 void glPaintCompositedOutput (const CompRegion &region,165 void glPaintCompositedOutput (const CompRegion &region,
166 GLFramebufferObject *fbo,166 ::GLFramebufferObject *fbo,
167 unsigned int mask);167 unsigned int mask);
168#endif168#endif
169169
@@ -321,7 +321,7 @@
321 unity::BGHash _bghash;321 unity::BGHash _bghash;
322322
323#ifdef USE_GLES323#ifdef USE_GLES
324 GLFramebufferObject *oldFbo;324 ::GLFramebufferObject *oldFbo;
325#else325#else
326 ScreenEffectFramebufferObject::Ptr _fbo;326 ScreenEffectFramebufferObject::Ptr _fbo;
327 GLuint _active_fbo;327 GLuint _active_fbo;