mirror of
https://github.com/brl/mutter.git
synced 2024-12-25 04:22:05 +00:00
Avoid casting CoglMatrix to a GLfloat * when calling glGetFloatv
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:
parent
4dd9200353
commit
c43ebcd7ff
@ -235,6 +235,7 @@ _cogl_get_matrix (CoglMatrixMode mode,
|
||||
else
|
||||
{
|
||||
GLenum gl_mode;
|
||||
GLfloat gl_matrix[16];
|
||||
|
||||
gl_mode = 0; /* silence compiler warning */
|
||||
switch (mode)
|
||||
@ -250,10 +251,14 @@ _cogl_get_matrix (CoglMatrixMode mode,
|
||||
break;
|
||||
}
|
||||
|
||||
/* hack alert: CoglMatrix is not really expecting us to
|
||||
* get *mutable* floats array from it
|
||||
/* Note: we have a redundant copy happening here. If that turns out to be
|
||||
* 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);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user