Commit aee05c31 authored by hybrid's avatar hybrid

Fix typo with using the wrong variable.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3225 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 11e37d62
...@@ -327,7 +327,7 @@ bool COpenGLSLMaterialRenderer::linkProgram() ...@@ -327,7 +327,7 @@ bool COpenGLSLMaterialRenderer::linkProgram()
GLint status = 0; GLint status = 0;
#ifdef GL_VERSION_2_0 #ifdef GL_VERSION_2_0
Driver->extGlGetProgramiv(Program, GL_LINK_STATUS, &status); Driver->extGlGetProgramiv(Program2, GL_LINK_STATUS, &status);
#endif #endif
if (!status) if (!status)
...@@ -337,10 +337,10 @@ bool COpenGLSLMaterialRenderer::linkProgram() ...@@ -337,10 +337,10 @@ bool COpenGLSLMaterialRenderer::linkProgram()
GLint maxLength=0; GLint maxLength=0;
GLsizei length; GLsizei length;
#ifdef GL_VERSION_2_0 #ifdef GL_VERSION_2_0
Driver->extGlGetProgramiv(Program, GL_INFO_LOG_LENGTH, &maxLength); Driver->extGlGetProgramiv(Program2, GL_INFO_LOG_LENGTH, &maxLength);
#endif #endif
GLchar *infoLog = new GLchar[maxLength]; GLchar *infoLog = new GLchar[maxLength];
Driver->extGlGetProgramInfoLog(Program, maxLength, &length, infoLog); Driver->extGlGetProgramInfoLog(Program2, maxLength, &length, infoLog);
os::Printer::log(reinterpret_cast<const c8*>(infoLog), ELL_ERROR); os::Printer::log(reinterpret_cast<const c8*>(infoLog), ELL_ERROR);
delete [] infoLog; delete [] infoLog;
...@@ -351,7 +351,7 @@ bool COpenGLSLMaterialRenderer::linkProgram() ...@@ -351,7 +351,7 @@ bool COpenGLSLMaterialRenderer::linkProgram()
GLint num = 0; GLint num = 0;
#ifdef GL_VERSION_2_0 #ifdef GL_VERSION_2_0
Driver->extGlGetProgramiv(Program, GL_ACTIVE_UNIFORMS, &num); Driver->extGlGetProgramiv(Program2, GL_ACTIVE_UNIFORMS, &num);
#endif #endif
if (num == 0) if (num == 0)
...@@ -362,7 +362,7 @@ bool COpenGLSLMaterialRenderer::linkProgram() ...@@ -362,7 +362,7 @@ bool COpenGLSLMaterialRenderer::linkProgram()
GLint maxlen = 0; GLint maxlen = 0;
#ifdef GL_VERSION_2_0 #ifdef GL_VERSION_2_0
Driver->extGlGetProgramiv(Program, GL_ACTIVE_UNIFORM_MAX_LENGTH, &maxlen); Driver->extGlGetProgramiv(Program2, GL_ACTIVE_UNIFORM_MAX_LENGTH, &maxlen);
#endif #endif
if (maxlen == 0) if (maxlen == 0)
...@@ -384,7 +384,7 @@ bool COpenGLSLMaterialRenderer::linkProgram() ...@@ -384,7 +384,7 @@ bool COpenGLSLMaterialRenderer::linkProgram()
memset(buf, 0, maxlen); memset(buf, 0, maxlen);
GLint size; GLint size;
Driver->extGlGetActiveUniform(Program, i, maxlen, 0, &size, &ui.type, reinterpret_cast<GLchar*>(buf)); Driver->extGlGetActiveUniform(Program2, i, maxlen, 0, &size, &ui.type, reinterpret_cast<GLchar*>(buf));
ui.name = buf; ui.name = buf;
UniformInfo.push_back(ui); UniformInfo.push_back(ui);
......
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