diff options
| author | SmileTheory <SmileTheory@gmail.com> | 2013-11-19 03:18:23 -0800 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2014-06-17 17:43:36 +0100 |
| commit | 85e0fa4841fd5ca6bf6c9b2f0204ee7be9c0915b (patch) | |
| tree | 967d7968faf0c62bc683bfa5eb9e00aa3b89d4b2 /src/renderergl2/tr_local.h | |
| parent | 38af27b32b1302fd5ddd83d992fc8ec73209b3ad (diff) | |
OpenGL2: Match glsl data type names: matrix_t -> mat4_t, vec*i_t -> ivec*_t
Diffstat (limited to 'src/renderergl2/tr_local.h')
| -rw-r--r-- | src/renderergl2/tr_local.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/renderergl2/tr_local.h b/src/renderergl2/tr_local.h index 557b285e..158d29dc 100644 --- a/src/renderergl2/tr_local.h +++ b/src/renderergl2/tr_local.h @@ -1455,9 +1455,9 @@ typedef struct { FBO_t *currentFBO; VBO_t *currentVBO; IBO_t *currentIBO; - matrix_t modelview; - matrix_t projection; - matrix_t modelviewProjection; + mat4_t modelview; + mat4_t projection; + mat4_t modelviewProjection; } glstate_t; typedef enum { @@ -1966,8 +1966,8 @@ void GL_TextureMode( const char *string ); void GL_CheckErrs( char *file, int line ); #define GL_CheckErrors(...) GL_CheckErrs(__FILE__, __LINE__) void GL_State( unsigned long stateVector ); -void GL_SetProjectionMatrix(matrix_t matrix); -void GL_SetModelviewMatrix(matrix_t matrix); +void GL_SetProjectionMatrix(mat4_t matrix); +void GL_SetModelviewMatrix(mat4_t matrix); void GL_TexEnv( int env ); void GL_Cull( int cullType ); @@ -2298,7 +2298,7 @@ void GLSL_SetUniformFloat5(shaderProgram_t *program, int uniformNum, const vec5_ void GLSL_SetUniformVec2(shaderProgram_t *program, int uniformNum, const vec2_t v); void GLSL_SetUniformVec3(shaderProgram_t *program, int uniformNum, const vec3_t v); void GLSL_SetUniformVec4(shaderProgram_t *program, int uniformNum, const vec4_t v); -void GLSL_SetUniformMatrix16(shaderProgram_t *program, int uniformNum, const matrix_t matrix); +void GLSL_SetUniformMat4(shaderProgram_t *program, int uniformNum, const mat4_t matrix); shaderProgram_t *GLSL_GetGenericShaderProgram(int stage); |