haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed wrong memory freeing.

This commit is contained in:
Maciej Suminski 2013-07-17 14:16:37 +02:00
parent 861ea0592e
commit 99e8814028
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/gal/opengl/shader.cpp
View File

@ -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 )
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
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
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;
} }