diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-24 19:55:03 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-24 19:55:05 +0100 |
commit | 00be968679152105fece89c3243a457b52d3f268 (patch) | |
tree | 3ca2128e7df8df3a69095f59cc0e384f7848c57e /src/quick/scenegraph/qsgcontext.cpp | |
parent | 5130f4a679ae38a1d931384188c021112a44065e (diff) | |
parent | 7ceefa60ab4f79d5f40e7051edf80c1a77ae7734 (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I68fd0e1d837bcd918c8efaf67fa88dee4a90b3be
Diffstat (limited to 'src/quick/scenegraph/qsgcontext.cpp')
-rw-r--r-- | src/quick/scenegraph/qsgcontext.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp index 9f58876def..0fe23f68ba 100644 --- a/src/quick/scenegraph/qsgcontext.cpp +++ b/src/quick/scenegraph/qsgcontext.cpp @@ -428,20 +428,6 @@ void QSGRenderContext::registerFontengineForCleanup(QFontEngine *engine) } /*! - compile/initialize are protected member functions of QSGMaterialShader. - We expose them here for custom renderers. - */ -void QSGRenderContext::compileShader(QSGMaterialShader *shader) -{ - shader->compile(); -} - -void QSGRenderContext::initializeShader(QSGMaterialShader *shader) -{ - shader->initialize(); -} - -/*! Initializes the scene graph render context with the GL context \a context. This also emits the ready() signal so that the QML graph can start building scene graph nodes. */ |