diff options
| author | SmileTheory <SmileTheory@gmail.com> | 2013-11-19 03:23:50 -0800 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2014-06-17 17:43:36 +0100 |
| commit | 57ba3ccbeaebc9d573caafff8765b821ac621413 (patch) | |
| tree | 5c11639ea65a29959043af0447576fe9d18e3718 /src/renderergl2/tr_surface.c | |
| parent | 85e0fa4841fd5ca6bf6c9b2f0204ee7be9c0915b (diff) | |
OpenGL2: Match glsl data type names: matrix_t -> mat4_t, vec*i_t -> ivec*_t
Diffstat (limited to 'src/renderergl2/tr_surface.c')
| -rw-r--r-- | src/renderergl2/tr_surface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/renderergl2/tr_surface.c b/src/renderergl2/tr_surface.c index 6853bdc7..2135da58 100644 --- a/src/renderergl2/tr_surface.c +++ b/src/renderergl2/tr_surface.c @@ -244,7 +244,7 @@ void RB_InstantQuad(vec4_t quadVerts[4]) GLSL_BindProgram(&tr.textureColorShader); - GLSL_SetUniformMatrix16(&tr.textureColorShader, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection); + GLSL_SetUniformMat4(&tr.textureColorShader, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection); GLSL_SetUniformVec4(&tr.textureColorShader, UNIFORM_COLOR, colorWhite); RB_InstantQuad2(quadVerts, texCoords); @@ -631,7 +631,7 @@ static void RB_SurfaceBeam( void ) GLSL_VertexAttribsState(ATTR_POSITION); GLSL_BindProgram(sp); - GLSL_SetUniformMatrix16(sp, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection); + GLSL_SetUniformMat4(sp, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection); GLSL_SetUniformVec4(sp, UNIFORM_COLOR, colorRed); |