Move classes in OpenGL renderer plugin into an OpenGL namespace

Change-Id: I5314da1df7fbfd1b6db4412e7bc71231525d9de2
Reviewed-by: Mike Krus <mike.krus@kdab.com>

4 files changed, 16 insertions, 6 deletions

diff --git a/src/render/framegraph/nopicking_p.h b/src/render/framegraph/nopicking_p.h
index 4ecf6e33b..f72090ef6 100644
--- a/src/render/framegraph/nopicking_p.h
+++ b/src/render/framegraph/nopicking_p.h
@@ -39,6 +39,7 @@
 
 #ifndef QT3DRENDER_RENDER_NOPICKING_P_H
 #define QT3DRENDER_RENDER_NOPICKING_P_H
+
 //
 //  W A R N I N G
 //  -------------
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index da5abe4ac..f043b9894 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -705,6 +705,7 @@ Render::AbstractRenderer *QRenderAspectPrivate::loadRendererPlugin()
         if (renderer)
             return renderer;
     }
+    qFatal("Unable to load a renderer plugin");
     return nullptr;
 }
 
diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp
index f3570f78d..94e30a2c0 100644
--- a/src/render/materialsystem/shader.cpp
+++ b/src/render/materialsystem/shader.cpp
@@ -166,6 +166,12 @@ void Shader::initializeFromReference(const Shader &other)
     setLog(other.log());
 }
 
+// Called by renderer plugin when loading a GL Shader plugins
+void Shader::requestCacheRebuild()
+{
+    markDirty(AbstractRenderer::MaterialDirty);
+}
+
 void Shader::setLog(const QString &log)
 {
     m_log = log;
diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h
index 0814989ea..5eccc7510 100644
--- a/src/render/materialsystem/shader_p.h
+++ b/src/render/materialsystem/shader_p.h
@@ -114,20 +114,22 @@ public:
     inline bool requiresFrontendSync() const { return m_requiresFrontendSync; }
     inline void unsetRequiresFrontendSync() { m_requiresFrontendSync = false; }
 
+    // Set by Renderer plugin
+    void setLog(const QString &log);
+    void setStatus(QShaderProgram::Status status);
+    void initializeFromReference(const Shader &other);
+
+    void requestCacheRebuild();
+
 private:
     QVector<QByteArray> m_shaderCode;
 
     QString m_log;
-    QShaderProgram::Status m_status;
     bool m_requiresFrontendSync;
+    QShaderProgram::Status m_status;
     QShaderProgram::Format m_format;
     bool m_dirty;
 
-    void initializeFromReference(const Shader &other);
-    void setLog(const QString &log);
-    void setStatus(QShaderProgram::Status status);
-
-    friend class GraphicsContext;
 };
 
 #ifndef QT_NO_DEBUG_STREAM