diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2013-03-20 17:20:28 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-22 08:56:47 +0200 |
commit | 1b34df6ea600bd361768be4091a255987e38f91c (patch) | |
tree | c6560a72770a7d7371f559280a2b8fa7a4ebe22c /src/gui/kernel/qopenglcontext.h | |
parent | 42d681f9cfc984046a93b9efe19903d46ac68bb1 (diff) |
Long live QOpenGLTexture!
Task-number: QTBUG-33274
Change-Id: I9259d947d11f8ba330a2cd7f5620d8f1af0a804b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/gui/kernel/qopenglcontext.h')
-rw-r--r-- | src/gui/kernel/qopenglcontext.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h index bfdb8921af..9756be30df 100644 --- a/src/gui/kernel/qopenglcontext.h +++ b/src/gui/kernel/qopenglcontext.h @@ -139,6 +139,9 @@ private: friend class QOpenGLMultiGroupSharedResource; }; + +class QOpenGLTextureHelper; + class Q_GUI_EXPORT QOpenGLContext : public QObject { Q_OBJECT @@ -207,6 +210,7 @@ private: friend class QSGDistanceFieldGlyphCache; friend class QWidgetPrivate; friend class QAbstractOpenGLFunctionsPrivate; + friend class QOpenGLTexturePrivate; void *qGLContextHandle() const; void setQGLContextHandle(void *handle,void (*qGLContextDeleteFunction)(void *)); @@ -217,6 +221,11 @@ private: QOpenGLVersionFunctionsBackend *backend); void removeFunctionsBackend(const QOpenGLVersionStatus &v); +#if !defined(QT_OPENGL_ES_2) + QOpenGLTextureHelper* textureFunctions() const; + void setTextureFunctions(QOpenGLTextureHelper* textureFuncs); +#endif + void destroy(); }; |