diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:49:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:49:09 +0200 |
| commit | 66feeb8de70291786499b3008ab8fded4043172a (patch) | |
| tree | 4c2029d9f51b2471c7c8dc0c3be9311640831595 /src/render/renderers/opengl/graphicshelpers | |
| parent | 7eb41022f19a57505c8eef3497ad6710fc92bd7d (diff) | |
| parent | 15e863517ea37ca7ba6bcb75b078272eddbc5d37 (diff) | |
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: I666d4ca1ad39f81e41a9b47a8828d1689ff2b33e
Diffstat (limited to 'src/render/renderers/opengl/graphicshelpers')
| -rw-r--r-- | src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp index cd082011b..4ec929b6e 100644 --- a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp +++ b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp @@ -887,7 +887,8 @@ int SubmissionContext::activateTexture(TextureScope scope, GLTexture *tex, int o // actually re-bind if required, the tex->dna on the unit not being the same // Note: tex->dna() could be 0 if the texture has not been created yet if (m_activeTextures[onUnit].texture != tex) { - QOpenGLTexture *glTex = tex->getOrCreateGLTexture(); + // Texture must have been created and updated at this point + QOpenGLTexture *glTex = tex->getGLTexture(); if (glTex == nullptr) return -1; glTex->bind(onUnit); |