diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-18 09:58:57 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-18 09:58:57 +0100 |
| commit | ba9ca0e3d64c46fc63cdbc62f3e4a96e36a842f8 (patch) | |
| tree | f9631624c841281302a2a546fbcc06a2375f410e /src/quick/scenegraph/qsgcontext_p.h | |
| parent | a65b8785621ebf58f34eb0c1759376fc0a1117c7 (diff) | |
| parent | 464bd2bf975797241213191a374e70431c5c3763 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/qml/jsruntime/qv4functionobject.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
Change-Id: Id164f6c3b45501aa466908659ec4e3b957323753
Diffstat (limited to 'src/quick/scenegraph/qsgcontext_p.h')
| -rw-r--r-- | src/quick/scenegraph/qsgcontext_p.h | 3 |
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); |