Stay clear of GL namespace

Preemptive future bug fixing brought to you by a crystal ball.

git-svn-id: https://s.snth.net/svn/neverball/branches/gles@3584 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/ball/game_draw.c b/ball/game_draw.c
index 23f63da..9b7c33e 100644 (file)
--- a/ball/game_draw.c
+++ b/ball/game_draw.c
@@ -277,7 +277,7 @@ static void game_clip_refl(int d)
 {
     /* Fudge to eliminate the floor from reflection. */
 
-    glClipPlane4f(GL_CLIP_PLANE0, 0, 1, 0, -0.00001);
+    glClipPlane4f_(GL_CLIP_PLANE0, 0, 1, 0, -0.00001);
 }
 
 static void game_clip_ball(const struct game_draw *gd, int d, const float *p)
@@ -315,8 +315,8 @@ static void game_clip_ball(const struct game_draw *gd, int d, const float *p)
     pz[1] *= d;
     nz[1] *= d;
 
-    glClipPlane4f(GL_CLIP_PLANE1, nz[0], nz[1], nz[2], nz[3]);
-    glClipPlane4f(GL_CLIP_PLANE2, pz[0], pz[1], pz[2], pz[3]);
+    glClipPlane4f_(GL_CLIP_PLANE1, nz[0], nz[1], nz[2], nz[3]);
+    glClipPlane4f_(GL_CLIP_PLANE2, pz[0], pz[1], pz[2], pz[3]);
 }
 
 static void game_draw_fore(struct s_rend *rend,

diff --git a/share/glext.c b/share/glext.c
index cd0d795..8ca7993 100644 (file)
--- a/share/glext.c
+++ b/share/glext.c
@@ -94,7 +94,7 @@ void glext_init(void)
 
 /*---------------------------------------------------------------------------*/
 
-void glClipPlane4f(GLenum p, GLfloat a, GLfloat b, GLfloat c, GLfloat d)
+void glClipPlane4f_(GLenum p, GLfloat a, GLfloat b, GLfloat c, GLfloat d)
 {
 #if ENABLE_OPENGLES
 

diff --git a/share/glext.h b/share/glext.h
index 26ea12d..338ad98 100644 (file)
--- a/share/glext.h
+++ b/share/glext.h
@@ -149,7 +149,7 @@ extern PFNGLPOINTPARAMETERFV_PROC glPointParameterfv_;
 /*---------------------------------------------------------------------------*/
 #endif /* !ENABLE_OPENGLES */
 
-void glClipPlane4f(GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+void glClipPlane4f_(GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
 
 /*---------------------------------------------------------------------------*/
 #endif