diff options
| author | Wieland Hagen <wieland.hagen@kdab.com> | 2017-01-09 12:05:29 +0700 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-01-09 20:14:56 +0000 |
| commit | 5386c767fa5a6be312f02b0cf23869974d5766b2 (patch) | |
| tree | ffda178afca99bcb63efaf20f0bfbee33bc3007e /src/render/graphicshelpers/graphicscontext_p.h | |
| parent | f6b03301aa17f0a6b086391a53841b37c6b95481 (diff) | |
Ignore RenderCommand for current frame, if shader not loaded yet
Renderer::m_shaderGathererJob might not have finished yet, so the shader
wasn't marked as dirty yet, so it wasn't loaded in
Renderer::updateGLResources(). Next frame everything will be alright.
Task-number: QTBUG-55093
Change-Id: Ia60ed1dff4cb0495efbd7f70f87d227007ef560d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/graphicshelpers/graphicscontext_p.h')
| -rw-r--r-- | src/render/graphicshelpers/graphicscontext_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/graphicshelpers/graphicscontext_p.h b/src/render/graphicshelpers/graphicscontext_p.h index 9f7a0f972..8067bb8b8 100644 --- a/src/render/graphicshelpers/graphicscontext_p.h +++ b/src/render/graphicshelpers/graphicscontext_p.h @@ -130,7 +130,7 @@ public: QOpenGLShaderProgram *createShaderProgram(Shader *shaderNode); void loadShader(Shader* shader); - void activateShader(ProgramDNA shaderDNA); + bool activateShader(ProgramDNA shaderDNA); void removeShaderProgramReference(Shader *shaderNode); GLuint activeFBO() const { return m_activeFBO; } |