Shader fixes

- Make sure that shaders marked for destruction are un marked from
  destruction if recreated before having been destroyed.

- When loading shaders, make sure the shader wasn't already loaded
  when loading it. This can happen is a shader is abandoned and then
  re adopted.

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

1 files changed, 5 insertions, 1 deletions

diff --git a/src/plugins/renderers/opengl/renderer/renderer.cpp b/src/plugins/renderers/opengl/renderer/renderer.cpp
index d01f22847..af43a4fe5 100644
--- a/src/plugins/renderers/opengl/renderer/renderer.cpp
+++ b/src/plugins/renderers/opengl/renderer/renderer.cpp
@@ -1178,6 +1178,10 @@ void Renderer::reloadDirtyShaders()
                 HShader shaderHandle = m_nodesManager->shaderManager()->lookupHandle(renderPass->shaderProgram());
                 Shader *shader = m_nodesManager->shaderManager()->data(shaderHandle);
 
+                // Shader could be null if the pass doesn't reference one yet
+                if (!shader)
+                    continue;
+
                 ShaderBuilder *shaderBuilder = nullptr;
                 for (const HShaderBuilder &builderHandle : activeBuilders) {
                     ShaderBuilder *builder = m_nodesManager->shaderBuilderManager()->data(builderHandle);
@@ -1205,7 +1209,7 @@ void Renderer::reloadDirtyShaders()
                     }
                 }
 
-                if (shader != nullptr && shader->isDirty())
+                if (shader->isDirty())
                     loadShader(shader, shaderHandle);
             }
         }