aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/qsgcontext_p.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2014-02-18 10:02:27 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-18 10:02:27 +0100
commit2528fce0a8d40772534cb03cd47e7db306327f15 (patch)
tree9f68b5db36d78177cd89d836cdadd4822e9d083f /src/quick/scenegraph/qsgcontext_p.h
parentf97f339f0bebceb00c01cc92acdbe045506c81c8 (diff)
parentba9ca0e3d64c46fc63cdbc62f3e4a96e36a842f8 (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/scenegraph/qsgcontext_p.h')
-rw-r--r--src/quick/scenegraph/qsgcontext_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h
index 3b58cecd6a..f8d5588649 100644
--- a/src/quick/scenegraph/qsgcontext_p.h
+++ b/src/quick/scenegraph/qsgcontext_p.h
@@ -106,6 +106,9 @@ public:
virtual QSGTexture *createTextureNoAtlas(const QImage &image) const;
virtual QSGRenderer *createRenderer();
+ virtual void compile(QSGMaterialShader *shader, QSGMaterial *material, const char *vertexCode = 0, const char *fragmentCode = 0);
+ virtual void initialize(QSGMaterialShader *shader);
+
void registerFontengineForCleanup(QFontEngine *engine);
static QSGRenderContext *from(QOpenGLContext *context);