brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Cogl enum when making modelview-matrix current in cogl_{rotate,transform,etc}

Browse Source 
My previous patch incorrectly used the GL enum with the _cogl_set_current_matrix
API.
This commit is contained in:
Robert Bragg 2009-03-12 13:32:10 +00:00
parent 2f34d14cb4
commit 3a9b18ef51
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clutter/cogl/common/cogl-current-matrix.c
View File

@ -307,35 +307,35 @@ _cogl_current_matrix_state_flush (void)
void void
cogl_push_matrix (void) cogl_push_matrix (void)
{ {
_cogl_set_current_matrix (GL_MODELVIEW); _cogl_set_current_matrix (COGL_MATRIX_MODELVIEW);
_cogl_current_matrix_push (); _cogl_current_matrix_push ();
} }
void void
cogl_pop_matrix (void) cogl_pop_matrix (void)
{ {
_cogl_set_current_matrix (GL_MODELVIEW); _cogl_set_current_matrix (COGL_MATRIX_MODELVIEW);
_cogl_current_matrix_pop (); _cogl_current_matrix_pop ();
} }
void void
cogl_scale (float x, float y, float z) cogl_scale (float x, float y, float z)
{ {
_cogl_set_current_matrix (GL_MODELVIEW); _cogl_set_current_matrix (COGL_MATRIX_MODELVIEW);
_cogl_current_matrix_scale (x, y, z); _cogl_current_matrix_scale (x, y, z);
} }
void void
cogl_translate (float x, float y, float z) cogl_translate (float x, float y, float z)
{ {
_cogl_set_current_matrix (GL_MODELVIEW); _cogl_set_current_matrix (COGL_MATRIX_MODELVIEW);
_cogl_current_matrix_translate (x, y, z); _cogl_current_matrix_translate (x, y, z);
} }
void void
cogl_rotate (float angle, float x, float y, float z) cogl_rotate (float angle, float x, float y, float z)
{ {
_cogl_set_current_matrix (GL_MODELVIEW); _cogl_set_current_matrix (COGL_MATRIX_MODELVIEW);
_cogl_current_matrix_rotate (angle, x, y, z); _cogl_current_matrix_rotate (angle, x, y, z);
} }