diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 03:01:35 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 03:01:43 +0200 |
| commit | 42e11789e4a2de7729ccba30dc465ca48e09e5e7 (patch) | |
| tree | 444735eaef11b8e3efe1813e6548c79b91820df1 | |
| parent | e915e062668155436eaf7dce461f31b0058d77c5 (diff) | |
| parent | 8e01b623ac220f181f39b8dc72415a2b9d57d16c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-alpha1
| -rw-r--r-- | src/render/renderers/opengl/graphicshelpers/graphicscontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/renderers/opengl/graphicshelpers/graphicscontext.cpp b/src/render/renderers/opengl/graphicshelpers/graphicscontext.cpp index c9b04fa8f..f4bd8b871 100644 --- a/src/render/renderers/opengl/graphicshelpers/graphicscontext.cpp +++ b/src/render/renderers/opengl/graphicshelpers/graphicscontext.cpp @@ -269,7 +269,7 @@ QOpenGLShaderProgram *GraphicsContext::createShaderProgram(Shader *shaderNode) // That assumes that the shaderProgram in Shader stays the same void GraphicsContext::introspectShaderInterface(Shader *shader, QOpenGLShaderProgram *shaderProgram) { - GraphicsHelperInterface *glHelper = resolveHighestOpenGLFunctions(); + QScopedPointer<GraphicsHelperInterface> glHelper(resolveHighestOpenGLFunctions()); shader->initializeUniforms(glHelper->programUniformsAndLocations(shaderProgram->programId())); shader->initializeAttributes(glHelper->programAttributesAndLocations(shaderProgram->programId())); if (m_glHelper->supportsFeature(GraphicsHelperInterface::UniformBufferObject)) |