projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a0da58b
)
Add GL_BGR to the list of defined GL constants, right next to GL_BGRA
author
Simon Hausmann
<simon.hausmann@nokia.com>
Tue, 21 Feb 2012 15:38:00 +0000
(16:38 +0100)
committer
Qt by Nokia
<qt-info@nokia.com>
Tue, 21 Feb 2012 21:31:00 +0000
(22:31 +0100)
We use this one in WebKit's OpenGL texture mapper and it would be
convenient to have it here if it's not defined by the platform.
Change-Id: Idae33e49773e21c6290b164bccd4f209cf9820a2
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
src/gui/opengl/qopenglfunctions.h
patch
|
blob
|
history
diff --git
a/src/gui/opengl/qopenglfunctions.h
b/src/gui/opengl/qopenglfunctions.h
index
881c27f
..
4e778dd
100644
(file)
--- a/
src/gui/opengl/qopenglfunctions.h
+++ b/
src/gui/opengl/qopenglfunctions.h
@@
-2073,6
+2073,9
@@
inline void QOpenGLFunctions::glVertexAttribPointer(GLuint indx, GLint size, GLe
#ifndef GL_RGBA4
#define GL_RGBA4 0x8056
#endif
+#ifndef GL_BGR
+#define GL_BGR 0x80E0
+#endif
#ifndef GL_BGRA
#define GL_BGRA 0x80E1
#endif