diff options
| author | Alexandros Frantzis <alexandros.frantzis@linaro.org> | 2012-01-24 12:35:30 +0200 |
|---|---|---|
| committer | Alexandros Frantzis <alexandros.frantzis@linaro.org> | 2012-01-24 12:35:30 +0200 |
| commit | 330e4ca33458bec4d803888c3bf227f18e4cbe7a (patch) | |
| tree | 972e4fd887da37305b4da90c6d9203d55a8e4b20 /plugins/unity-mt-grab-handles | |
| parent | 811900096975a9571dbb7cf11ca58b713f96f373 (diff) | |
GLES2: Fix gles2 compilation in unity-mt-grab-handles.
(bzr r1826.3.7)
Diffstat (limited to 'plugins/unity-mt-grab-handles')
| -rw-r--r-- | plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp index db43d7473..c17ad2d0f 100644 --- a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp +++ b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp @@ -439,7 +439,7 @@ UnityMTGrabHandlesWindow::getOutputExtents(CompWindowExtents& output) bool UnityMTGrabHandlesWindow::glDraw(const GLMatrix& transform, #ifdef USE_GLES - GLWindowPaintAttrib& attrib, + const GLWindowPaintAttrib& attrib, #else GLFragment::Attrib& fragment, #endif @@ -506,9 +506,9 @@ UnityMTGrabHandlesWindow::glDraw(const GLMatrix& transform, if (gWindow->geometry().vertices) { fragment.setOpacity(mHandles->opacity()); -#endif /* Texture rendering set-up */ us->gScreen->setTexEnvMode(GL_MODULATE); +#endif glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); /* Draw the dim texture with all of it's modified * geometry glory */ @@ -523,8 +523,8 @@ UnityMTGrabHandlesWindow::glDraw(const GLMatrix& transform, PAINT_WINDOW_TRANSFORMED_MASK); /* Texture rendering tear-down */ glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); - us->gScreen->setTexEnvMode(GL_REPLACE); #ifndef USE_GLES + us->gScreen->setTexEnvMode(GL_REPLACE); } #endif } |