diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-22 09:24:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-22 09:24:57 +0100 |
| commit | 520b9823954628f66b256bcf6e0c96f30ed4f625 (patch) | |
| tree | aa8cb07880d8c96b1020bfd8dd43c9dc7bcd8df5 /src/render/graphicshelpers/graphicscontext.cpp | |
| parent | f91ee783c5704b0d55da0d96dacf6eca8933e748 (diff) | |
| parent | 9409dd81287af75108023abbd66e49e07ba65de6 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/render/backend/renderer.cpp
Change-Id: I691f54cd6daef8a966df37d447164c94badce34c
Diffstat (limited to 'src/render/graphicshelpers/graphicscontext.cpp')
| -rw-r--r-- | src/render/graphicshelpers/graphicscontext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/render/graphicshelpers/graphicscontext.cpp b/src/render/graphicshelpers/graphicscontext.cpp index d33aca825..9e8e3d610 100644 --- a/src/render/graphicshelpers/graphicscontext.cpp +++ b/src/render/graphicshelpers/graphicscontext.cpp @@ -515,7 +515,8 @@ void GraphicsContext::loadShader(Shader *shader, ShaderManager *manager) shaderProgram = createShaderProgram(shader); // Store in cache - m_shaderCache.insert(shader->dna(), shader->peerId(), shaderProgram); + if (shaderProgram) + m_shaderCache.insert(shader->dna(), shader->peerId(), shaderProgram); } // Ensure the Shader node knows about the program interface |