Remove useless virtual method

It's only used internally anyway.
Also fix couple warnings.

Change-Id: Ibe44fbcede0676b3822c5003ed447430ae93d2dc
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

5 files changed, 10 insertions, 31 deletions

diff --git a/src/plugins/renderers/opengl/renderer/renderer.cpp b/src/plugins/renderers/opengl/renderer/renderer.cpp
index 407d0d25c..7eceaf944 100644
--- a/src/plugins/renderers/opengl/renderer/renderer.cpp
+++ b/src/plugins/renderers/opengl/renderer/renderer.cpp
@@ -393,14 +393,6 @@ QOpenGLContext *Renderer::shareContext() const
                              : nullptr);
 }
 
-// Executed in the reloadDirtyShader job
-void Renderer::loadShader(Shader *shader, HShader shaderHandle)
-{
-    Q_UNUSED(shader);
-    if (!Qt3DCore::contains(m_dirtyShaders, shaderHandle))
-        m_dirtyShaders.push_back(shaderHandle);
-}
-
 void Renderer::setOpenGLContext(QOpenGLContext *context)
 {
     m_glContext = context;
@@ -1069,8 +1061,10 @@ void Renderer::reloadDirtyShaders()
                     }
                 }
 
-                if (shader->isDirty())
-                    loadShader(shader, shaderHandle);
+                if (shader->isDirty()) {
+                    if (!Qt3DCore::contains(m_dirtyShaders, shaderHandle))
+                        m_dirtyShaders.push_back(shaderHandle);
+                }
             }
         }
     }
diff --git a/src/plugins/renderers/opengl/renderer/renderer_p.h b/src/plugins/renderers/opengl/renderer/renderer_p.h
index 1d12e5039..4e4b7a28a 100644
--- a/src/plugins/renderers/opengl/renderer/renderer_p.h
+++ b/src/plugins/renderers/opengl/renderer/renderer_p.h
@@ -236,10 +236,6 @@ public:
 
     inline GLResourceManagers *glResourceManagers() const { return m_glResourceManagers; }
 
-    // Executed in secondary GL thread
-    void loadShader(Shader *shader, Qt3DRender::Render::HShader shaderHandle) override;
-
-
     void updateGLResources();
     void updateTexture(Texture *texture);
     void cleanupTexture(Qt3DCore::QNodeId cleanedUpTextureId);
diff --git a/src/plugins/renderers/rhi/renderer/renderer.cpp b/src/plugins/renderers/rhi/renderer/renderer.cpp
index 4af374c35..9dedbc081 100644
--- a/src/plugins/renderers/rhi/renderer/renderer.cpp
+++ b/src/plugins/renderers/rhi/renderer/renderer.cpp
@@ -401,14 +401,6 @@ QOpenGLContext *Renderer::shareContext() const
     return nullptr;
 }
 
-// Executed in the reloadDirtyShader job
-void Renderer::loadShader(Shader *shader, HShader shaderHandle)
-{
-    Q_UNUSED(shader);
-    if (!Qt3DCore::contains(m_dirtyShaders, shaderHandle))
-        m_dirtyShaders.push_back(shaderHandle);
-}
-
 void Renderer::setOpenGLContext(QOpenGLContext *context)
 {
     m_glContext = context;
@@ -1507,8 +1499,10 @@ void Renderer::reloadDirtyShaders()
                     }
                 }
 
-                if (shader != nullptr && shader->isDirty())
-                    loadShader(shader, shaderHandle);
+                if (shader != nullptr && shader->isDirty()) {
+                    if (!Qt3DCore::contains(m_dirtyShaders, shaderHandle))
+                        m_dirtyShaders.push_back(shaderHandle);
+                }
             }
         }
     }
@@ -2588,6 +2582,8 @@ bool Renderer::uploadBuffersForCommand(RHIGraphicsPipeline* graphicsPipeline, Re
 
 bool Renderer::uploadBuffersForCommand(RHIComputePipeline* computePipeline, RenderCommand &command)
 {
+    Q_UNUSED(computePipeline);
+    Q_UNUSED(command);
     return true;
 }
 
diff --git a/src/plugins/renderers/rhi/renderer/renderer_p.h b/src/plugins/renderers/rhi/renderer/renderer_p.h
index d0d06c7b4..29a9541d6 100644
--- a/src/plugins/renderers/rhi/renderer/renderer_p.h
+++ b/src/plugins/renderers/rhi/renderer/renderer_p.h
@@ -247,9 +247,6 @@ public:
 
     inline RHIResourceManagers *rhiResourceManagers() const { return m_RHIResourceManagers; }
 
-    // Executed in secondary GL thread
-    void loadShader(Shader *shader, Qt3DRender::Render::HShader shaderHandle) override;
-
     void updateResources();
     void updateTexture(Texture *texture);
     void cleanupTexture(Qt3DCore::QNodeId cleanedUpTextureId);
diff --git a/src/render/backend/abstractrenderer_p.h b/src/render/backend/abstractrenderer_p.h
index 2eec1bc1b..c0fd9dd73 100644
--- a/src/render/backend/abstractrenderer_p.h
+++ b/src/render/backend/abstractrenderer_p.h
@@ -196,10 +196,6 @@ public:
     virtual QSurfaceFormat format() = 0;
     virtual QOpenGLContext *shareContext() const = 0;
     virtual const GraphicsApiFilterData *contextInfo() const = 0;
-
-    // These commands are executed in a dedicated command thread
-    // More will be added later
-    virtual void loadShader(Shader *shader, Qt3DRender::Render::HShader shaderHandle) = 0;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(AbstractRenderer::BackendNodeDirtySet)