summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-08-06 23:49:30 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-08-08 09:23:59 +0200
commit56d45b721f15946acaf1c6ee7c4c0003fbe1d554 (patch)
tree14f46f13eeae6e692732a05353500a51afb2112a
parent161931ba7b915490ac9b9c57ca721857cf734fe0 (diff)
make sure that we always delete the shader and not only the program
Change-Id: Ia02fb20d335e2172f607f13a0de78ea666d094f5
-rw-r--r--vcl/source/opengl/OpenGLHelper.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 84a1399fc296..a34ad753f811 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -122,6 +122,9 @@ GLint OpenGLHelper::LoadShaders(const OUString& rVertexShaderName,const OUString
glAttachShader(ProgramID, FragmentShaderID);
glLinkProgram(ProgramID);
+ glDeleteShader(VertexShaderID);
+ glDeleteShader(FragmentShaderID);
+
// Check the program
glGetProgramiv(ProgramID, GL_LINK_STATUS, &Result);
if ( !Result )
@@ -140,9 +143,6 @@ GLint OpenGLHelper::LoadShaders(const OUString& rVertexShaderName,const OUString
return 0;
}
- glDeleteShader(VertexShaderID);
- glDeleteShader(FragmentShaderID);
-
return ProgramID;
}