mirror of
https://github.com/brl/mutter.git
synced 2024-11-24 00:50:42 -05:00
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'.
23 lines
1.1 KiB
Diff
23 lines
1.1 KiB
Diff
diff --git a/clutter/cogl/gles/cogl-gles2-wrapper.h b/clutter/cogl/gles/cogl-gles2-wrapper.h
|
|
index 8cb9e8b..a194157 100644
|
|
--- a/clutter/cogl/gles/cogl-gles2-wrapper.h
|
|
+++ b/clutter/cogl/gles/cogl-gles2-wrapper.h
|
|
@@ -244,7 +244,7 @@ void cogl_wrap_glColor4x (GLclampx r, GLclampx g, GLclampx b, GLclampx a);
|
|
void cogl_wrap_glClipPlanex (GLenum plane, GLfloat *equation);
|
|
|
|
void cogl_wrap_glGetIntegerv (GLenum pname, GLint *params);
|
|
-void cogl_wrap_glGetFixedv (GLenum pname, GLfloat *params);
|
|
+void cogl_wrap_glGetFloatv (GLenum pname, GLfloat *params);
|
|
|
|
void cogl_wrap_glFogx (GLenum pname, GLfloat param);
|
|
void cogl_wrap_glFogxv (GLenum pname, const GLfloat *params);
|
|
@@ -299,7 +299,7 @@ void _cogl_gles2_clear_cache_for_program (CoglHandle program);
|
|
#define cogl_wrap_glColor4x glColor4f
|
|
#define cogl_wrap_glClipPlanex glClipPlanef
|
|
#define cogl_wrap_glGetIntegerv glGetIntegerv
|
|
-#define cogl_wrap_glGetFixedv glGetFixedv
|
|
+#define cogl_wrap_glGetFloatv glGetFloatv
|
|
#define cogl_wrap_glFogx glFogf
|
|
#define cogl_wrap_glFogxv glFogfv
|
|
#define cogl_wrap_glTexParameteri glTexParameteri
|