mirror of
https://github.com/brl/mutter.git
synced 2025-03-29 06:33:46 +00:00
[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)
This commit is contained in:
parent
755f3935f3
commit
eb8ce66e61
@ -272,34 +272,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 glClearColorx
|
#define cogl_wrap_glClearColorx glClearColor
|
||||||
#define cogl_wrap_glDrawArrays glDrawArrays
|
#define cogl_wrap_glDrawArrays glDrawArrays
|
||||||
#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 glMultMatrixx
|
#define cogl_wrap_glMultMatrixx glMultMatrixf
|
||||||
#define cogl_wrap_glFrustumx glFrustumx
|
#define cogl_wrap_glFrustumx glFrustumf
|
||||||
#define cogl_wrap_glScalex glScalex
|
#define cogl_wrap_glScalex glScalef
|
||||||
#define cogl_wrap_glTranslatex glTranslatex
|
#define cogl_wrap_glTranslatex glTranslatef
|
||||||
#define cogl_wrap_glRotatex glRotatex
|
#define cogl_wrap_glRotatex glRotatef
|
||||||
#define cogl_wrap_glOrthox glOrthox
|
#define cogl_wrap_glOrthox glOrthof
|
||||||
#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 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 glColor4x
|
#define cogl_wrap_glColor4x glColor4f
|
||||||
#define cogl_wrap_glClipPlanex glClipPlanex
|
#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_glFogx glFogf
|
||||||
#define cogl_wrap_glFogxv glFogxv
|
#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
|
/* The extra third parameter of the bind texture wrapper isn't needed
|
||||||
|
Loading…
x
Reference in New Issue
Block a user