Fix scenegraph backend API for material shaders.

Without this change, it is not possible to implement a custom renderer
(it has no way to compile or initialize material shaders).

Change-Id: Ie8778f739f3551f88f0d44ccb9769063a87ff276
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>

diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h
index bfe570c..98f4d8a 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgmaterial.h
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.h
@@ -103,7 +103,7 @@ protected:
     Q_DECLARE_PRIVATE(QSGMaterialShader)
     QSGMaterialShader(QSGMaterialShaderPrivate &dd);
 
-    friend class QSGContext;
+    friend class QSGRenderContext;
     friend class QSGBatchRenderer::ShaderManager;
 
     void setShaderSourceFile(QOpenGLShader::ShaderType type, const QString &sourceFile);

diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index f9bc615..5135cc6 100644 (file)
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -446,6 +446,20 @@ 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 8378fe9..ef67dcc 100644 (file)
--- a/src/quick/scenegraph/qsgcontext_p.h
+++ b/src/quick/scenegraph/qsgcontext_p.h
@@ -112,6 +112,9 @@ public:
 
     bool hasBrokenIndexBufferObjects() const { return m_brokenIBOs; }
 
+    void compileShader(QSGMaterialShader *shader);
+    void initializeShader(QSGMaterialShader *shader);
+
 Q_SIGNALS:
     void initialized();
     void invalidated();