Revert "Fix scenegraph backend API for material shaders."

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>

diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index f91dfc5304968072a2039f3ce68fb5903bb37c45..c58ae85f30246298fa86a92d72aee1b274144e13 100644 (file)
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -445,20 +445,6 @@ void QSGRenderContext::registerFontengineForCleanup(QFontEngine *engine)
     m_fontEnginesToClean << 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 b7dc93ae7223de48419e1f1a383e5d574c82cab9..6f55dd6f1222f898fb1dbc2da1e86207ac0c2f0b 100644 (file)
--- 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();