isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-27 05:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
7a96ea9255
mutter/fixed-to-float-patches/gles-cogl-gles2-wrapper.h.0.patch

77 lines
3.6 KiB
Diff
Raw Normal View History

[cogl/gles] Fixes for building for GLES 1 using floats * This adds GLfixed -> GLfloat conversion * redefines cogl_wrap_glBlahx macros as glBlahf * Other misc fixes (mostly corresponding to cogl/gl equivalents)
2009-01-08 22:56:17 +00:00
diff --git a/clutter/cogl/gles/cogl-gles2-wrapper.h b/clutter/cogl/gles/cogl-gles2-wrapper.h
[fixed-to-float.sh] Use float names for the GLES2 wrappers For example cogl_wrap_glFrustumx -> cogl_wrap_glFrustumf. The wrappers get #defined to the float versions anyway but it helps avoid some confusion. The conversion is done using a regular expression in the upgrade script. Some of the patches had to be updated to apply cleanly.
2009-01-16 12:16:28 +00:00
index cb700cc..f126993 100644
[cogl/gles] Fixes for building for GLES 1 using floats * This adds GLfixed -> GLfloat conversion * redefines cogl_wrap_glBlahx macros as glBlahf * Other misc fixes (mostly corresponding to cogl/gl equivalents)
2009-01-08 22:56:17 +00:00
--- a/clutter/cogl/gles/cogl-gles2-wrapper.h
+++ b/clutter/cogl/gles/cogl-gles2-wrapper.h
[fixed-to-float-patches] Fix use of glClearColor and glColor under GLES 2 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.
2009-01-15 18:53:52 +00:00
@@ -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);
[fixed-to-float.sh] Use float names for the GLES2 wrappers For example cogl_wrap_glFrustumx -> cogl_wrap_glFrustumf. The wrappers get #defined to the float versions anyway but it helps avoid some confusion. The conversion is done using a regular expression in the upgrade script. Some of the patches had to be updated to apply cleanly.
2009-01-16 12:16:28 +00:00
-void cogl_wrap_glColor4f (GLclampx r, GLclampx g, GLclampx b, GLclampx a);
[fixed-to-float-patches] Fix use of glClearColor and glColor under GLES 2 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.
2009-01-15 18:53:52 +00:00
+void cogl_wrap_glColor4f (GLclampf r, GLclampf g, GLclampf b, GLclampf a);
[fixed-to-float.sh] Use float names for the GLES2 wrappers For example cogl_wrap_glFrustumx -> cogl_wrap_glFrustumf. The wrappers get #defined to the float versions anyway but it helps avoid some confusion. The conversion is done using a regular expression in the upgrade script. Some of the patches had to be updated to apply cleanly.
2009-01-16 12:16:28 +00:00
void cogl_wrap_glClipPlanef (GLenum plane, GLfloat *equation);
[fixed-to-float-patches] Fix some of the matrix getters and setters The GL versions of get_modelview_matrix, get_projection_matrix and get_viewport were using glGetDoublev and then converting them to floats, but it might as well just call glGetFloatv directly. The GL ES versions were using glGetFixedv but this was being replaced with glGetFloatv by the #define in the GLES 2 wrappers. The patch also replaces the glGetFixedv wrapper with glGetFloatv. Previously this was calling cogl_gles2_float_array_to_fixed which actually converted to float. That function has been removed and memcpy is used instead.
2009-01-15 15:24:05 +00:00
void cogl_wrap_glGetIntegerv (GLenum pname, GLint *params);
-void cogl_wrap_glGetFixedv (GLenum pname, GLfloat *params);
+void cogl_wrap_glGetFloatv (GLenum pname, GLfloat *params);
[fixed-to-float.sh] Use float names for the GLES2 wrappers For example cogl_wrap_glFrustumx -> cogl_wrap_glFrustumf. The wrappers get #defined to the float versions anyway but it helps avoid some confusion. The conversion is done using a regular expression in the upgrade script. Some of the patches had to be updated to apply cleanly.
2009-01-16 12:16:28 +00:00
void cogl_wrap_glFogf (GLenum pname, GLfloat param);
void cogl_wrap_glFogfv (GLenum pname, const GLfloat *params);
[fixed-to-float-patches] Move the changes to gles2-wrapper.h into the patch It looks like the changes to cogl-gles2-wrapper.h were accidentally committed to the actual file instead of the patch in commit de27da0e. This commit moves the changes back into the patch so cogl-gles2-wrapper.h is reverted back to master.
2009-01-16 10:50:53 +00:00
@@ -273,35 +271,34 @@ void _cogl_gles2_clear_cache_for_program (CoglHandle program);
[fixed-to-float-patches] Fix use of glClearColor and glColor under GLES 2 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.
2009-01-15 18:53:52 +00:00
/* If we're not using GL ES 2 then just use the GL functions
directly */
[fixed-to-float-patches] Move the changes to gles2-wrapper.h into the patch It looks like the changes to cogl-gles2-wrapper.h were accidentally committed to the actual file instead of the patch in commit de27da0e. This commit moves the changes back into the patch so cogl-gles2-wrapper.h is reverted back to master.
2009-01-16 10:50:53 +00:00
-#define cogl_wrap_glClearColorx glClearColorx
[fixed-to-float-patches] Fix use of glClearColor and glColor under GLES 2 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.
2009-01-15 18:53:52 +00:00
#define cogl_wrap_glDrawArrays glDrawArrays
#define cogl_wrap_glDrawElements glDrawElements
#define cogl_wrap_glPushMatrix glPushMatrix
[fixed-to-float-patches] Move the changes to gles2-wrapper.h into the patch It looks like the changes to cogl-gles2-wrapper.h were accidentally committed to the actual file instead of the patch in commit de27da0e. This commit moves the changes back into the patch so cogl-gles2-wrapper.h is reverted back to master.
2009-01-16 10:50:53 +00:00
#define cogl_wrap_glPopMatrix glPopMatrix
#define cogl_wrap_glMatrixMode glMatrixMode
#define cogl_wrap_glLoadIdentity glLoadIdentity
[fixed-to-float.sh] Use float names for the GLES2 wrappers For example cogl_wrap_glFrustumx -> cogl_wrap_glFrustumf. The wrappers get #defined to the float versions anyway but it helps avoid some confusion. The conversion is done using a regular expression in the upgrade script. Some of the patches had to be updated to apply cleanly.
2009-01-16 12:16:28 +00:00
-#define cogl_wrap_glMultMatrixf glMultMatrixx
-#define cogl_wrap_glFrustumf glFrustumx
-#define cogl_wrap_glScalef glScalex
-#define cogl_wrap_glTranslatef glTranslatex
-#define cogl_wrap_glRotatef glRotatex
-#define cogl_wrap_glOrthof glOrthox
+#define cogl_wrap_glMultMatrixf glMultMatrixf
+#define cogl_wrap_glFrustumf glFrustumf
+#define cogl_wrap_glScalef glScalef
+#define cogl_wrap_glTranslatef glTranslatef
+#define cogl_wrap_glRotatef glRotatef
+#define cogl_wrap_glOrthof glOrthof
[fixed-to-float-patches] Move the changes to gles2-wrapper.h into the patch It looks like the changes to cogl-gles2-wrapper.h were accidentally committed to the actual file instead of the patch in commit de27da0e. This commit moves the changes back into the patch so cogl-gles2-wrapper.h is reverted back to master.
2009-01-16 10:50:53 +00:00
#define cogl_wrap_glEnable glEnable
#define cogl_wrap_glDisable glDisable
#define cogl_wrap_glTexCoordPointer glTexCoordPointer
#define cogl_wrap_glVertexPointer glVertexPointer
#define cogl_wrap_glColorPointer glColorPointer
#define cogl_wrap_glNormalPointer glNormalPointer
[fixed-to-float.sh] Use float names for the GLES2 wrappers For example cogl_wrap_glFrustumx -> cogl_wrap_glFrustumf. The wrappers get #defined to the float versions anyway but it helps avoid some confusion. The conversion is done using a regular expression in the upgrade script. Some of the patches had to be updated to apply cleanly.
2009-01-16 12:16:28 +00:00
-#define cogl_wrap_glTexEnvf glTexEnvx
+#define cogl_wrap_glTexEnvf glTexEnvf
[fixed-to-float-patches] Fix use of glClearColor and glColor under GLES 2 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.
2009-01-15 18:53:52 +00:00
#define cogl_wrap_glEnableClientState glEnableClientState
#define cogl_wrap_glDisableClientState glDisableClientState
#define cogl_wrap_glAlphaFunc glAlphaFunc
[fixed-to-float.sh] Use float names for the GLES2 wrappers For example cogl_wrap_glFrustumx -> cogl_wrap_glFrustumf. The wrappers get #defined to the float versions anyway but it helps avoid some confusion. The conversion is done using a regular expression in the upgrade script. Some of the patches had to be updated to apply cleanly.
2009-01-16 12:16:28 +00:00
-#define cogl_wrap_glColor4f glColor4x
-#define cogl_wrap_glClipPlanef glClipPlanex
[fixed-to-float-patches] Fix use of glClearColor and glColor under GLES 2 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.
2009-01-15 18:53:52 +00:00
+#define cogl_wrap_glColor4f glColor4f
[fixed-to-float.sh] Use float names for the GLES2 wrappers For example cogl_wrap_glFrustumx -> cogl_wrap_glFrustumf. The wrappers get #defined to the float versions anyway but it helps avoid some confusion. The conversion is done using a regular expression in the upgrade script. Some of the patches had to be updated to apply cleanly.
2009-01-16 12:16:28 +00:00
+#define cogl_wrap_glClipPlanef glClipPlanef
[cogl/gles] Fixes for building for GLES 1 using floats * This adds GLfixed -> GLfloat conversion * redefines cogl_wrap_glBlahx macros as glBlahf * Other misc fixes (mostly corresponding to cogl/gl equivalents)
2009-01-08 22:56:17 +00:00
#define cogl_wrap_glGetIntegerv glGetIntegerv
-#define cogl_wrap_glGetFixedv glGetFixedv
[fixed-to-float.sh] Use float names for the GLES2 wrappers For example cogl_wrap_glFrustumx -> cogl_wrap_glFrustumf. The wrappers get #defined to the float versions anyway but it helps avoid some confusion. The conversion is done using a regular expression in the upgrade script. Some of the patches had to be updated to apply cleanly.
2009-01-16 12:16:28 +00:00
-#define cogl_wrap_glFogf glFogx
-#define cogl_wrap_glFogfv glFogxv
[fixed-to-float-patches] Fix some of the matrix getters and setters The GL versions of get_modelview_matrix, get_projection_matrix and get_viewport were using glGetDoublev and then converting them to floats, but it might as well just call glGetFloatv directly. The GL ES versions were using glGetFixedv but this was being replaced with glGetFloatv by the #define in the GLES 2 wrappers. The patch also replaces the glGetFixedv wrapper with glGetFloatv. Previously this was calling cogl_gles2_float_array_to_fixed which actually converted to float. That function has been removed and memcpy is used instead.
2009-01-15 15:24:05 +00:00
+#define cogl_wrap_glGetFloatv glGetFloatv
[fixed-to-float.sh] Use float names for the GLES2 wrappers For example cogl_wrap_glFrustumx -> cogl_wrap_glFrustumf. The wrappers get #defined to the float versions anyway but it helps avoid some confusion. The conversion is done using a regular expression in the upgrade script. Some of the patches had to be updated to apply cleanly.
2009-01-16 12:16:28 +00:00
+#define cogl_wrap_glFogf glFogf
+#define cogl_wrap_glFogfv glFogfv
[cogl/gles] Fixes for building for GLES 1 using floats * This adds GLfixed -> GLfloat conversion * redefines cogl_wrap_glBlahx macros as glBlahf * Other misc fixes (mostly corresponding to cogl/gl equivalents)
2009-01-08 22:56:17 +00:00
#define cogl_wrap_glTexParameteri glTexParameteri
[fixed-to-float-patches] Move the changes to gles2-wrapper.h into the patch It looks like the changes to cogl-gles2-wrapper.h were accidentally committed to the actual file instead of the patch in commit de27da0e. This commit moves the changes back into the patch so cogl-gles2-wrapper.h is reverted back to master.
2009-01-16 10:50:53 +00:00
/* The extra third parameter of the bind texture wrapper isn't needed
Reference in New Issue Copy Permalink