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

Avoid casting CoglMatrix to a GLfloat * when calling glGetFloatv

Browse Source 
If we later add internal flags to CoglMatrix then this code wouldn't
initialize those flags. The ways it's now done adds a redundant copy, but
if that turns out to be something worth optimizing we can look again at
using a cast but adding another way for initializing internal flags.
This commit is contained in:
Robert Bragg 2009-03-06 03:29:51 +00:00
parent 61b867442b
commit 0d88ecb459
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,6 +235,7 @@ _cogl_get_matrix (CoglMatrixMode mode,
else else
{ {
GLenum gl_mode; GLenum gl_mode;
GLfloat gl_matrix[16];
gl_mode = 0; /* silence compiler warning */ gl_mode = 0; /* silence compiler warning */
switch (mode) switch (mode)
@ -250,10 +251,14 @@ _cogl_get_matrix (CoglMatrixMode mode,
break; break;
} }
/* hack alert: CoglMatrix is not really expecting us to /* Note: we have a redundant copy happening here. If that turns out to be
* get *mutable* floats array from it * a problem then, since this is internal to Cogl, we could pass the
* CoglMatrix pointer directly to glGetFloatv; the only problem with that
* is that if we later add internal flags to CoglMatrix they will need to
* be initialized seperatly.
*/ */
GE (glGetFloatv (gl_mode, (GLfloat*) matrix)); GE (glGetFloatv (gl_mode, gl_matrix));
cogl_matrix_init_from_array (matrix, gl_matrix);
} }
} }