brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fixed-to-float-patches] Move the changes to gles2-wrapper.h into the patch

Browse Source 
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.
This commit is contained in:
Neil Roberts 2009-01-16 10:50:53 +00:00
parent bef099ce40
commit 52d7b7be73
2 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
clutter/cogl/gles/cogl-gles2-wrapper.h
View File

@ -273,35 +273,35 @@ void _cogl_gles2_clear_cache_for_program (CoglHandle program);
/* If we're not using GL ES 2 then just use the GL functions /* If we're not using GL ES 2 then just use the GL functions
directly */ directly */
#define cogl_wrap_glClearColorx glClearColor #define cogl_wrap_glClearColorx glClearColorx
#define cogl_wrap_glDrawArrays glDrawArrays #define cogl_wrap_glDrawArrays glDrawArrays
#define cogl_wrap_glDrawElements glDrawElements #define cogl_wrap_glDrawElements glDrawElements
#define cogl_wrap_glPushMatrix glPushMatrix #define cogl_wrap_glPushMatrix glPushMatrix
#define cogl_wrap_glPopMatrix glPopMatrix #define cogl_wrap_glPopMatrix glPopMatrix
#define cogl_wrap_glMatrixMode glMatrixMode #define cogl_wrap_glMatrixMode glMatrixMode
#define cogl_wrap_glLoadIdentity glLoadIdentity #define cogl_wrap_glLoadIdentity glLoadIdentity
#define cogl_wrap_glMultMatrixx glMultMatrixf #define cogl_wrap_glMultMatrixx glMultMatrixx
#define cogl_wrap_glFrustumx glFrustumf #define cogl_wrap_glFrustumx glFrustumx
#define cogl_wrap_glScalex glScalef #define cogl_wrap_glScalex glScalex
#define cogl_wrap_glTranslatex glTranslatef #define cogl_wrap_glTranslatex glTranslatex
#define cogl_wrap_glRotatex glRotatef #define cogl_wrap_glRotatex glRotatex
#define cogl_wrap_glOrthox glOrthof #define cogl_wrap_glOrthox glOrthox
#define cogl_wrap_glEnable glEnable #define cogl_wrap_glEnable glEnable
#define cogl_wrap_glDisable glDisable #define cogl_wrap_glDisable glDisable
#define cogl_wrap_glTexCoordPointer glTexCoordPointer #define cogl_wrap_glTexCoordPointer glTexCoordPointer
#define cogl_wrap_glVertexPointer glVertexPointer #define cogl_wrap_glVertexPointer glVertexPointer
#define cogl_wrap_glColorPointer glColorPointer #define cogl_wrap_glColorPointer glColorPointer
#define cogl_wrap_glNormalPointer glNormalPointer #define cogl_wrap_glNormalPointer glNormalPointer
#define cogl_wrap_glTexEnvx glTexEnvf #define cogl_wrap_glTexEnvx glTexEnvx
#define cogl_wrap_glEnableClientState glEnableClientState #define cogl_wrap_glEnableClientState glEnableClientState
#define cogl_wrap_glDisableClientState glDisableClientState #define cogl_wrap_glDisableClientState glDisableClientState
#define cogl_wrap_glAlphaFunc glAlphaFunc #define cogl_wrap_glAlphaFunc glAlphaFunc
#define cogl_wrap_glColor4x glColor4f #define cogl_wrap_glColor4x glColor4x
#define cogl_wrap_glClipPlanex glClipPlanef #define cogl_wrap_glClipPlanex glClipPlanex
#define cogl_wrap_glGetIntegerv glGetIntegerv #define cogl_wrap_glGetIntegerv glGetIntegerv
#define cogl_wrap_glGetFixedv glGetFixedv #define cogl_wrap_glGetFixedv glGetFixedv
#define cogl_wrap_glFogx glFogf #define cogl_wrap_glFogx glFogx
#define cogl_wrap_glFogxv glFogfv #define cogl_wrap_glFogxv glFogxv
#define cogl_wrap_glTexParameteri glTexParameteri #define cogl_wrap_glTexParameteri glTexParameteri
/* The extra third parameter of the bind texture wrapper isn't needed /* The extra third parameter of the bind texture wrapper isn't needed

43
fixed-to-float-patches/gles-cogl-gles2-wrapper.h.0.patch
View File

@ -1,5 +1,5 @@
diff --git a/clutter/cogl/gles/cogl-gles2-wrapper.h b/clutter/cogl/gles/cogl-gles2-wrapper.h diff --git a/clutter/cogl/gles/cogl-gles2-wrapper.h b/clutter/cogl/gles/cogl-gles2-wrapper.h
index 8cb9e8b..561cb66 100644 index ad741be..561cb66 100644
--- a/clutter/cogl/gles/cogl-gles2-wrapper.h --- a/clutter/cogl/gles/cogl-gles2-wrapper.h
+++ b/clutter/cogl/gles/cogl-gles2-wrapper.h +++ b/clutter/cogl/gles/cogl-gles2-wrapper.h
@@ -203,8 +203,6 @@ struct _CoglGles2WrapperShader @@ -203,8 +203,6 @@ struct _CoglGles2WrapperShader
@ -26,24 +26,51 @@ index 8cb9e8b..561cb66 100644
void cogl_wrap_glFogx (GLenum pname, GLfloat param); void cogl_wrap_glFogx (GLenum pname, GLfloat param);
void cogl_wrap_glFogxv (GLenum pname, const GLfloat *params); void cogl_wrap_glFogxv (GLenum pname, const GLfloat *params);
@@ -273,7 +271,6 @@ void _cogl_gles2_clear_cache_for_program (CoglHandle program); @@ -273,35 +271,34 @@ void _cogl_gles2_clear_cache_for_program (CoglHandle program);
/* If we're not using GL ES 2 then just use the GL functions /* If we're not using GL ES 2 then just use the GL functions
directly */ directly */
-#define cogl_wrap_glClearColorx glClearColor -#define cogl_wrap_glClearColorx glClearColorx
#define cogl_wrap_glDrawArrays glDrawArrays #define cogl_wrap_glDrawArrays glDrawArrays
#define cogl_wrap_glDrawElements glDrawElements #define cogl_wrap_glDrawElements glDrawElements
#define cogl_wrap_glPushMatrix glPushMatrix #define cogl_wrap_glPushMatrix glPushMatrix
@@ -296,10 +293,10 @@ void _cogl_gles2_clear_cache_for_program (CoglHandle program); #define cogl_wrap_glPopMatrix glPopMatrix
#define cogl_wrap_glMatrixMode glMatrixMode
#define cogl_wrap_glLoadIdentity glLoadIdentity
-#define cogl_wrap_glMultMatrixx glMultMatrixx
-#define cogl_wrap_glFrustumx glFrustumx
-#define cogl_wrap_glScalex glScalex
-#define cogl_wrap_glTranslatex glTranslatex
-#define cogl_wrap_glRotatex glRotatex
-#define cogl_wrap_glOrthox glOrthox
+#define cogl_wrap_glMultMatrixx glMultMatrixf
+#define cogl_wrap_glFrustumx glFrustumf
+#define cogl_wrap_glScalex glScalef
+#define cogl_wrap_glTranslatex glTranslatef
+#define cogl_wrap_glRotatex glRotatef
+#define cogl_wrap_glOrthox glOrthof
#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
-#define cogl_wrap_glTexEnvx glTexEnvx
+#define cogl_wrap_glTexEnvx glTexEnvf
#define cogl_wrap_glEnableClientState glEnableClientState #define cogl_wrap_glEnableClientState glEnableClientState
#define cogl_wrap_glDisableClientState glDisableClientState #define cogl_wrap_glDisableClientState glDisableClientState
#define cogl_wrap_glAlphaFunc glAlphaFunc #define cogl_wrap_glAlphaFunc glAlphaFunc
-#define cogl_wrap_glColor4x glColor4f -#define cogl_wrap_glColor4x glColor4x
-#define cogl_wrap_glClipPlanex glClipPlanex
+#define cogl_wrap_glColor4f glColor4f +#define cogl_wrap_glColor4f glColor4f
#define cogl_wrap_glClipPlanex glClipPlanef +#define cogl_wrap_glClipPlanex glClipPlanef
#define cogl_wrap_glGetIntegerv glGetIntegerv #define cogl_wrap_glGetIntegerv glGetIntegerv
-#define cogl_wrap_glGetFixedv glGetFixedv -#define cogl_wrap_glGetFixedv glGetFixedv
-#define cogl_wrap_glFogx glFogx
-#define cogl_wrap_glFogxv glFogxv
+#define cogl_wrap_glGetFloatv glGetFloatv +#define cogl_wrap_glGetFloatv glGetFloatv
#define cogl_wrap_glFogx glFogf +#define cogl_wrap_glFogx glFogf
#define cogl_wrap_glFogxv glFogfv +#define cogl_wrap_glFogxv glFogfv
#define cogl_wrap_glTexParameteri glTexParameteri #define cogl_wrap_glTexParameteri glTexParameteri
/* The extra third parameter of the bind texture wrapper isn't needed