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
1=== modified file 'plugins/unityshell/src/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2012-03-14 13:05:59 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2012-03-16 11:34:42 +0000
4@@ -1231,7 +1231,7 @@
5
6 #ifdef USE_GLES
7 void UnityScreen::glPaintCompositedOutput (const CompRegion &region,
8- GLFramebufferObject *fbo,
9+ ::GLFramebufferObject *fbo,
10 unsigned int mask)
11 {
12 bool useFbo = false;
13@@ -1242,11 +1242,11 @@
14 useFbo = fbo->checkStatus () && fbo->tex ();
15 if (!useFbo) {
16 printf ("bailing from UnityScreen::glPaintCompositedOutput");
17- GLFramebufferObject::rebind (oldFbo);
18+ ::GLFramebufferObject::rebind (oldFbo);
19 return;
20 }
21 paintDisplay();
22- GLFramebufferObject::rebind (oldFbo);
23+ ::GLFramebufferObject::rebind (oldFbo);
24 }
25
26 gScreen->glPaintCompositedOutput(region, fbo, mask);
27
28=== modified file 'plugins/unityshell/src/unityshell.h'
29--- plugins/unityshell/src/unityshell.h 2012-03-13 12:13:08 +0000
30+++ plugins/unityshell/src/unityshell.h 2012-03-16 11:34:42 +0000
31@@ -163,7 +163,7 @@
32 unsigned int);
33 #ifdef USE_GLES
34 void glPaintCompositedOutput (const CompRegion &region,
35- GLFramebufferObject *fbo,
36+ ::GLFramebufferObject *fbo,
37 unsigned int mask);
38 #endif
39
40@@ -321,7 +321,7 @@
41 unity::BGHash _bghash;
42
43 #ifdef USE_GLES
44- GLFramebufferObject *oldFbo;
45+ ::GLFramebufferObject *oldFbo;
46 #else
47 ScreenEffectFramebufferObject::Ptr _fbo;
48 GLuint _active_fbo;