4e94500a2a
The patches have been updated to apply cleanly. The patches for the g_warnings in clutter-actor.c have been removed because master now uses CLUTTER_UNITS_FORMAT so they aren't necessary. The clutter-units.h patch now sets CLUTTER_UNITS_FORMAT to 'f'.
59 lines
1.6 KiB
Diff
59 lines
1.6 KiB
Diff
diff --git a/clutter/cogl/gles/cogl-gles2-wrapper.c b/clutter/cogl/gles/cogl-gles2-wrapper.c
|
|
index b2e19eb..9435131 100644
|
|
--- a/clutter/cogl/gles/cogl-gles2-wrapper.c
|
|
+++ b/clutter/cogl/gles/cogl-gles2-wrapper.c
|
|
@@ -1158,15 +1158,6 @@ cogl_wrap_glClipPlanex (GLenum plane, GLfloat *equation)
|
|
/* FIXME */
|
|
}
|
|
|
|
-static void
|
|
-cogl_gles2_float_array_to_fixed (int size,
|
|
- const GLfloat *floats,
|
|
- GLfloat *fixeds)
|
|
-{
|
|
- while (size-- > 0)
|
|
- *(fixeds++) = (*(floats++));
|
|
-}
|
|
-
|
|
void
|
|
cogl_wrap_glGetIntegerv (GLenum pname, GLint *params)
|
|
{
|
|
@@ -1185,31 +1176,24 @@ cogl_wrap_glGetIntegerv (GLenum pname, GLint *params)
|
|
}
|
|
|
|
void
|
|
-cogl_wrap_glGetFixedv (GLenum pname, GLfloat *params)
|
|
+cogl_wrap_glGetFloatv (GLenum pname, GLfloat *params)
|
|
{
|
|
_COGL_GET_GLES2_WRAPPER (w, NO_RETVAL);
|
|
|
|
switch (pname)
|
|
{
|
|
case GL_MODELVIEW_MATRIX:
|
|
- cogl_gles2_float_array_to_fixed (16, w->modelview_stack
|
|
- + w->modelview_stack_pos * 16,
|
|
- params);
|
|
+ memcpy (params, w->modelview_stack + w->modelview_stack_pos * 16,
|
|
+ sizeof (GLfloat) * 16);
|
|
break;
|
|
|
|
case GL_PROJECTION_MATRIX:
|
|
- cogl_gles2_float_array_to_fixed (16, w->projection_stack
|
|
- + w->projection_stack_pos * 16,
|
|
- params);
|
|
+ memcpy (params, w->projection_stack + w->projection_stack_pos * 16,
|
|
+ sizeof (GLfloat) * 16);
|
|
break;
|
|
|
|
case GL_VIEWPORT:
|
|
- {
|
|
- GLfloat v[4];
|
|
-
|
|
- glGetFloatv (GL_VIEWPORT, v);
|
|
- cogl_gles2_float_array_to_fixed (4, v, params);
|
|
- }
|
|
+ glGetFloatv (GL_VIEWPORT, params);
|
|
break;
|
|
}
|
|
}
|