diff options
| author | Trond Kjernåsen <trond@trolltech.com> | 2009-11-16 14:08:45 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond@trolltech.com> | 2009-11-16 14:19:18 (GMT) |
| commit | 7916895ae64441b6d683f816718fc78fdafbfc62 (patch) | |
| tree | 969b1effc69c7fc38d2cf762f35d26423a5269ce /src/opengl/qgl_p.h | |
| parent | 040994514e6f51061b93ea951e0ae2d3b2d97526 (diff) | |
| download | Qt-7916895ae64441b6d683f816718fc78fdafbfc62.zip Qt-7916895ae64441b6d683f816718fc78fdafbfc62.tar.gz Qt-7916895ae64441b6d683f816718fc78fdafbfc62.tar.bz2 | |
Fixed extension checks and usage of the GL 2 engine on old X11 systems.
This fixes a regression from 4.5, where exporting a GL capable display
from an old X11 HP/Sun workstation to a modern Linux machine causes
crashes and lots of X11 error output. Just relying on the client
GL version number is not enough under X11, since the server might
only support GL 1.1 with non or very few extensions.
Also, the extension checks worked a bit randomly since it checked
for sub-strings which might or might not occur within one or more
full extension names.
Task-number: QTBUG-5853
Reviewed-by: Kim
Diffstat (limited to 'src/opengl/qgl_p.h')
| -rw-r--r-- | src/opengl/qgl_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 45b2942..8e472e5 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -375,7 +375,8 @@ public: NVFloatBuffer = 0x00000400, PixelBufferObject = 0x00000800, FramebufferBlit = 0x00001000, - NPOTTextures = 0x00002000 + NPOTTextures = 0x00002000, + BGRATextureFormat = 0x00004000 }; Q_DECLARE_FLAGS(Extensions, Extension) |