diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2009-11-17 22:56:58 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2009-11-17 22:56:58 (GMT) |
| commit | e22ca6088407987cb69ccd03f162b431d5c2bf99 (patch) | |
| tree | 12bb1de5c59670ad2c966cea60b9fd4d28dead2e /src/opengl/qgl_p.h | |
| parent | f2b02ed855f7149afca0cc2e046c09c54a2d4444 (diff) | |
| parent | a61adccf96a8ceefbf1150966adda3f6d226ec6d (diff) | |
| download | Qt-e22ca6088407987cb69ccd03f162b431d5c2bf99.zip Qt-e22ca6088407987cb69ccd03f162b431d5c2bf99.tar.gz Qt-e22ca6088407987cb69ccd03f162b431d5c2bf99.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/opengl/qgl_p.h')
| -rw-r--r-- | src/opengl/qgl_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 9a17c67..8e472e5 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -233,6 +233,7 @@ public: QGLExtensionFuncs &extensionFuncs() {return m_extensionFuncs;} const QGLContext *context() const {return m_context;} + bool isSharing() const { return m_shares.size() >= 2; } void addGuard(QGLSharedResourceGuard *guard); void removeGuard(QGLSharedResourceGuard *guard); @@ -374,7 +375,8 @@ public: NVFloatBuffer = 0x00000400, PixelBufferObject = 0x00000800, FramebufferBlit = 0x00001000, - NPOTTextures = 0x00002000 + NPOTTextures = 0x00002000, + BGRATextureFormat = 0x00004000 }; Q_DECLARE_FLAGS(Extensions, Extension) |