mirror of
https://github.com/brl/mutter.git
synced 2024-11-23 16:40:41 -05:00
bef099ce40
The wrapper for glClearColor was taking fixed arguments but was given floating point values so it ended up always setting the clear color to black. Now that GLES 1.1 is using the floating point version, there is no need for the wrapper so both versions now just use glClearColor directly. A similar problem was happening for glColor but this does still need a wrapper because it needs to set the vertex attribute.
50 lines
2.3 KiB
Diff
50 lines
2.3 KiB
Diff
diff --git a/clutter/cogl/gles/cogl-gles2-wrapper.h b/clutter/cogl/gles/cogl-gles2-wrapper.h
|
|
index 8cb9e8b..561cb66 100644
|
|
--- a/clutter/cogl/gles/cogl-gles2-wrapper.h
|
|
+++ b/clutter/cogl/gles/cogl-gles2-wrapper.h
|
|
@@ -203,8 +203,6 @@ struct _CoglGles2WrapperShader
|
|
void cogl_gles2_wrapper_init (CoglGles2Wrapper *wrapper);
|
|
void cogl_gles2_wrapper_deinit (CoglGles2Wrapper *wrapper);
|
|
|
|
-void cogl_wrap_glClearColorx (GLclampx r, GLclampx g, GLclampx b, GLclampx a);
|
|
-
|
|
void cogl_wrap_glPushMatrix ();
|
|
void cogl_wrap_glPopMatrix ();
|
|
void cogl_wrap_glMatrixMode (GLenum mode);
|
|
@@ -239,12 +237,12 @@ void cogl_wrap_glDisableClientState (GLenum array);
|
|
|
|
void cogl_wrap_glAlphaFunc (GLenum func, GLclampf ref);
|
|
|
|
-void cogl_wrap_glColor4x (GLclampx r, GLclampx g, GLclampx b, GLclampx a);
|
|
+void cogl_wrap_glColor4f (GLclampf r, GLclampf g, GLclampf b, GLclampf 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);
|
|
@@ -273,7 +271,6 @@ void _cogl_gles2_clear_cache_for_program (CoglHandle program);
|
|
/* If we're not using GL ES 2 then just use the GL functions
|
|
directly */
|
|
|
|
-#define cogl_wrap_glClearColorx glClearColor
|
|
#define cogl_wrap_glDrawArrays glDrawArrays
|
|
#define cogl_wrap_glDrawElements glDrawElements
|
|
#define cogl_wrap_glPushMatrix glPushMatrix
|
|
@@ -296,10 +293,10 @@ void _cogl_gles2_clear_cache_for_program (CoglHandle program);
|
|
#define cogl_wrap_glEnableClientState glEnableClientState
|
|
#define cogl_wrap_glDisableClientState glDisableClientState
|
|
#define cogl_wrap_glAlphaFunc glAlphaFunc
|
|
-#define cogl_wrap_glColor4x glColor4f
|
|
+#define cogl_wrap_glColor4f 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
|