diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-17 06:24:00 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-17 06:24:00 (GMT) |
commit | 21b388616a0daf06d27d1e1d471e8423fff44f50 (patch) | |
tree | 080641177a6dab05b021bcc4e75e97fc6cc52e3d /src/opengl/qgl_p.h | |
parent | 58c08b1195add26e2ff96844885ea9d6c124da30 (diff) | |
parent | f60eeb5c165d5b9e5998edae7785cc893a613bca (diff) | |
download | Qt-21b388616a0daf06d27d1e1d471e8423fff44f50.zip Qt-21b388616a0daf06d27d1e1d471e8423fff44f50.tar.gz Qt-21b388616a0daf06d27d1e1d471e8423fff44f50.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/opengl/qgl_p.h')
-rw-r--r-- | src/opengl/qgl_p.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index f19e394..d92f963 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -345,7 +345,7 @@ public: HDC hbitmap_hdc; #endif #ifndef QT_NO_EGL - bool ownsEglContext; + uint ownsEglContext : 1; QEglContext *eglContext; EGLSurface eglSurface; void destroyEglSurfaceForDevice(); @@ -382,6 +382,12 @@ public: uint internal_context : 1; uint version_flags_cached : 1; uint extension_flags_cached : 1; + + // workarounds for driver/hw bugs on different platforms + uint workaround_needsFullClearOnEveryFrame : 1; + uint workaround_brokenFBOReadBack : 1; + uint workaroundsCached : 1; + QPaintDevice *paintDevice; QColor transpColor; QGLContext *q_ptr; |