From 53ba8bd92c17ae95c31570aab50a5492fce720d5 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Fri, 16 Jan 2009 10:50:53 +0000 Subject: [PATCH] [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. --- gles/cogl-gles2-wrapper.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gles/cogl-gles2-wrapper.h b/gles/cogl-gles2-wrapper.h index 05f7c600f..7e7472c58 100644 --- a/gles/cogl-gles2-wrapper.h +++ b/gles/cogl-gles2-wrapper.h @@ -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 directly */ -#define cogl_wrap_glClearColorx glClearColor +#define cogl_wrap_glClearColorx glClearColorx #define cogl_wrap_glDrawArrays glDrawArrays #define cogl_wrap_glDrawElements glDrawElements #define cogl_wrap_glPushMatrix glPushMatrix #define cogl_wrap_glPopMatrix glPopMatrix #define cogl_wrap_glMatrixMode glMatrixMode #define cogl_wrap_glLoadIdentity glLoadIdentity -#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_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_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 glTexEnvf +#define cogl_wrap_glTexEnvx glTexEnvx #define cogl_wrap_glEnableClientState glEnableClientState #define cogl_wrap_glDisableClientState glDisableClientState #define cogl_wrap_glAlphaFunc glAlphaFunc -#define cogl_wrap_glColor4x glColor4f -#define cogl_wrap_glClipPlanex glClipPlanef +#define cogl_wrap_glColor4x glColor4x +#define cogl_wrap_glClipPlanex glClipPlanex #define cogl_wrap_glGetIntegerv glGetIntegerv #define cogl_wrap_glGetFixedv glGetFixedv -#define cogl_wrap_glFogx glFogf -#define cogl_wrap_glFogxv glFogfv +#define cogl_wrap_glFogx glFogx +#define cogl_wrap_glFogxv glFogxv #define cogl_wrap_glTexParameteri glTexParameteri /* The extra third parameter of the bind texture wrapper isn't needed