From ebda31048c35634f0fd2e3825d94cc6b6dcc253a Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Mon, 13 Sep 2010 10:05:11 +0000 Subject: [PATCH] [ filter virtual range scan ] glGetUniformLocation() bug fixed --- src/fgt/filter_virtual_range_scan/vs/stages.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/fgt/filter_virtual_range_scan/vs/stages.h b/src/fgt/filter_virtual_range_scan/vs/stages.h index 6533c70ac..aca073aae 100644 --- a/src/fgt/filter_virtual_range_scan/vs/stages.h +++ b/src/fgt/filter_virtual_range_scan/vs/stages.h @@ -86,7 +86,8 @@ namespace vs // shader facilities void bindSampler( QString samplerName, PixelData* pData ) { - GLchar* c = (GLchar*)samplerName.toStdString().c_str(); + const string str = samplerName.toStdString(); + const GLchar* c = (const GLchar*)( str.c_str() ); GLint loc = glGetUniformLocation( prog->programId, c ); GLint textureUnit = (GLint)samplers.size(); pData->bind( textureUnit ); @@ -123,15 +124,17 @@ namespace vs void uploadFloat( QString uniformName, GLfloat value ) { - GLchar* name = (GLchar*)uniformName.toStdString().c_str(); - GLint loc = glGetUniformLocation( prog->programId, name ); + const string str = uniformName.toStdString(); + const GLchar* c = (const GLchar*)( str.c_str() ); + GLint loc = glGetUniformLocation( prog->programId, c ); glUniform1f( loc, value ); } void uploadInt( QString uniformName, GLint value ) { - GLchar* name = (GLchar*)uniformName.toStdString().c_str(); - GLint loc = glGetUniformLocation( prog->programId, name ); + const string str = uniformName.toStdString(); + const GLchar* c = (const GLchar*)( str.c_str() ); + GLint loc = glGetUniformLocation( prog->programId, c ); glUniform1i( loc, value ); }