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_flares.c | |
parent | 38af27b32b1302fd5ddd83d992fc8ec73209b3ad (diff) |
OpenGL2: Match glsl data type names: matrix_t -> mat4_t, vec*i_t -> ivec*_t
Diffstat (limited to 'src/renderergl2/tr_flares.c')
-rw-r--r-- | src/renderergl2/tr_flares.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/renderergl2/tr_flares.c b/src/renderergl2/tr_flares.c index 4ac81329..76abbdd7 100644 --- a/src/renderergl2/tr_flares.c +++ b/src/renderergl2/tr_flares.c @@ -459,7 +459,7 @@ void RB_RenderFlares (void) { flare_t *f; flare_t **prev; qboolean draw; - matrix_t oldmodelview, oldprojection, matrix; + mat4_t oldmodelview, oldprojection, matrix; if ( !r_flares->integer ) { return; @@ -517,11 +517,11 @@ void RB_RenderFlares (void) { qglDisable (GL_CLIP_PLANE0); } - Matrix16Copy(glState.projection, oldprojection); - Matrix16Copy(glState.modelview, oldmodelview); - Matrix16Identity(matrix); + Mat4Copy(glState.projection, oldprojection); + Mat4Copy(glState.modelview, oldmodelview); + Mat4Identity(matrix); GL_SetModelviewMatrix(matrix); - Matrix16Ortho( backEnd.viewParms.viewportX, backEnd.viewParms.viewportX + backEnd.viewParms.viewportWidth, + Mat4Ortho( backEnd.viewParms.viewportX, backEnd.viewParms.viewportX + backEnd.viewParms.viewportWidth, backEnd.viewParms.viewportY, backEnd.viewParms.viewportY + backEnd.viewParms.viewportHeight, -99999, 99999, matrix ); GL_SetProjectionMatrix(matrix); |