summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@live.com>2014-02-14 16:20:22 -0600
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-19 06:41:31 +0100
commit7ceefa60ab4f79d5f40e7051edf80c1a77ae7734 (patch)
treeb6be6dff602677abd2e6c67c50dfcfa4d81270a8
parent464bd2bf975797241213191a374e70431c5c3763 (diff)
Revert "Fix scenegraph backend API for material shaders."old/5.2
This reverts commit a8a90519cb35481e96fe8889846bfaa424e13e8a. The same functionality is now available in a more extensible way via the program binary support recently added. Change-Id: I07b1939611a76858e65605ce625da6c4cbca2114 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
-rw-r--r--src/quick/scenegraph/qsgcontext.cpp14
-rw-r--r--src/quick/scenegraph/qsgcontext_p.h3
2 files changed, 0 insertions, 17 deletions
diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index f91dfc5304..c58ae85f30 100644
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -446,20 +446,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.
*/
diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h
index b7dc93ae72..6f55dd6f12 100644
--- a/src/quick/scenegraph/qsgcontext_p.h
+++ b/src/quick/scenegraph/qsgcontext_p.h
@@ -115,9 +115,6 @@ public:
bool hasBrokenIndexBufferObjects() const { return m_brokenIBOs; }
- void compileShader(QSGMaterialShader *shader);
- void initializeShader(QSGMaterialShader *shader);
-
Q_SIGNALS:
void initialized();
void invalidated();