Commit 99e88140 authored by Maciej Suminski's avatar Maciej Suminski

Fixed wrong memory freeing.

parent 861ea059
...@@ -164,7 +164,7 @@ void SHADER::programInfo( GLuint aProgram ) ...@@ -164,7 +164,7 @@ void SHADER::programInfo( GLuint aProgram )
wxLogInfo( wxString::FromUTF8( (char*) glInfoLog ) ); wxLogInfo( wxString::FromUTF8( (char*) glInfoLog ) );
delete glInfoLog; delete[] glInfoLog;
} }
} }
...@@ -185,7 +185,7 @@ void SHADER::shaderInfo( GLuint aShader ) ...@@ -185,7 +185,7 @@ void SHADER::shaderInfo( GLuint aShader )
wxLogInfo( wxString::FromUTF8( (char*) glInfoLog ) ); wxLogInfo( wxString::FromUTF8( (char*) glInfoLog ) );
delete glInfoLog; delete[] glInfoLog;
} }
} }
...@@ -246,6 +246,9 @@ bool SHADER::addSource( const std::string& aShaderSource, ShaderType aShaderType ...@@ -246,6 +246,9 @@ bool SHADER::addSource( const std::string& aShaderSource, ShaderType aShaderType
glShaderSource( shaderNumber, 1, source_, NULL ); glShaderSource( shaderNumber, 1, source_, NULL );
programInfo( programNumber ); programInfo( programNumber );
// Delete the allocated char array
delete[] source;
// Compile and attach shader to the program // Compile and attach shader to the program
glCompileShader( shaderNumber ); glCompileShader( shaderNumber );
GLint status; GLint status;
...@@ -270,9 +273,6 @@ bool SHADER::addSource( const std::string& aShaderSource, ShaderType aShaderType ...@@ -270,9 +273,6 @@ bool SHADER::addSource( const std::string& aShaderSource, ShaderType aShaderType
glProgramParameteriEXT( programNumber, GL_GEOMETRY_OUTPUT_TYPE_EXT, geomOutputType ); glProgramParameteriEXT( programNumber, GL_GEOMETRY_OUTPUT_TYPE_EXT, geomOutputType );
} }
// Delete the allocated char array
delete[] source;
return true; return true;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment