From 0d88ecb45928d9decb3ab7fc52493a24cd81334c Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Fri, 6 Mar 2009 03:29:51 +0000 Subject: [PATCH] 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. --- clutter/cogl/common/cogl-current-matrix.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/clutter/cogl/common/cogl-current-matrix.c b/clutter/cogl/common/cogl-current-matrix.c index e2eb1d31f..498484e9a 100644 --- a/clutter/cogl/common/cogl-current-matrix.c +++ b/clutter/cogl/common/cogl-current-matrix.c @@ -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); } }