From c29069fe501b25491853280eda783f52baf860da Mon Sep 17 00:00:00 2001
From: jpaana <>
Date: Tue, 29 Apr 2003 19:26:25 +0000
Subject: [PATCH] Cleaned up some warnings with Linux GL headers

---
 glNV.h       | 6 +++---
 gl_bumparb.c | 6 ++----
 gl_rmain.c   | 2 ++
 glquake.h    | 7 +++++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/glNV.h b/glNV.h
index 31b35fa..6aef8fb 100644
--- a/glNV.h
+++ b/glNV.h
@@ -52,14 +52,14 @@ typedef void (APIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage,
 typedef void (APIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
 typedef void (APIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
 typedef void (APIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
-
-
 #endif
 
+
+#ifndef GL_NV_register_combiners2 
 /* NV_register_combiners2 */
 typedef void (APIENTRY * PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
 typedef void (APIENTRY * PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
-
+#endif
 
 extern PFNGLCOMBINERPARAMETERFVNVPROC qglCombinerParameterfvNV;
 extern PFNGLCOMBINERPARAMETERIVNVPROC qglCombinerParameterivNV;
diff --git a/gl_bumparb.c b/gl_bumparb.c
index 508a75f..6bf5b27 100644
--- a/gl_bumparb.c
+++ b/gl_bumparb.c
@@ -29,6 +29,7 @@ All lights require 1 pass:
 
 #include "quakedef.h"
 
+#ifndef GL_ATI_pn_triangles
 // PN_triangles_ATI
 #define GL_PN_TRIANGLES_ATI                       0x87F0
 #define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
@@ -42,15 +43,12 @@ All lights require 1 pass:
 
 typedef void (APIENTRY *PFNGLPNTRIANGLESIATIPROC)(GLenum pname, GLint param);
 typedef void (APIENTRY *PFNGLPNTRIANGLESFATIPROC)(GLenum pname, GLfloat param);
+#endif
 
 // actually in gl_bumpradeon (duh...)
 extern PFNGLPNTRIANGLESIATIPROC qglPNTrianglesiATI;
 extern PFNGLPNTRIANGLESFATIPROC qglPNTrianglesfATI;
 
-// Separate_stencil_ATI
-typedef void (APIENTRY *PFNGLSTENCILOPSEPARATEATIPROC)(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRY *PFNGLSTENCILFUNCSEPARATEATIPROC)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-
 extern PFNGLSTENCILOPSEPARATEATIPROC qglStencilOpSeparateATI;
 extern PFNGLSTENCILFUNCSEPARATEATIPROC qglStencilFuncSeparateATI;
 
diff --git a/gl_rmain.c b/gl_rmain.c
index 6741fb3..0fb83bb 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -167,6 +167,7 @@ cvar_t	sh_delux = {"sh_delux","1"};
 mirrorplane_t mirrorplanes[NUM_MIRROR_PLANES];
 int mirror_contents;
 
+#ifndef GL_ATI_pn_triangles
 #define GL_PN_TRIANGLES_ATI                       0x87F0
 #define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
 #define GL_PN_TRIANGLES_POINT_MODE_ATI            0x87F2
@@ -179,6 +180,7 @@ int mirror_contents;
 
 typedef void (APIENTRY *PFNGLPNTRIANGLESIATIPROC)(GLenum pname, GLint param);
 typedef void (APIENTRY *PFNGLPNTRIANGLESFATIPROC)(GLenum pname, GLfloat param);
+#endif
 
 // actually in gl_bumpradeon (duh...)
 extern PFNGLPNTRIANGLESIATIPROC qglPNTrianglesiATI;
diff --git a/glquake.h b/glquake.h
index 193db9a..45fba61 100644
--- a/glquake.h
+++ b/glquake.h
@@ -473,7 +473,7 @@ extern PFNGLSTENCILFUNCSEPARATEATIPROC qglStencilFuncSeparateATI;
 
 #endif /* !__APPLE__ && !MACOSX */
 
-
+#ifndef GL_VERSION_1_3 
 typedef void (APIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
 typedef void (APIENTRY * PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
 typedef void (APIENTRY * PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
@@ -508,6 +508,7 @@ typedef void (APIENTRY * PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, G
 typedef void (APIENTRY * PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
 typedef void (APIENTRY * PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
 typedef void (APIENTRY * PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+#endif
 
 extern PFNGLACTIVETEXTUREARBPROC qglActiveTextureARB;
 extern PFNGLCLIENTACTIVETEXTUREARBPROC qglClientActiveTextureARB;
@@ -791,6 +792,7 @@ extern PFNGLVERTEXATTRIB4UBVARBPROC		qglVertexAttrib4ubvARB;
 
 //PENTA: VERTEX_PROGRAM
 
+#ifndef GL_NV_vertex_program
 /* NV_vertex_program */
 #define GL_VERTEX_PROGRAM_NV              0x8620
 #define GL_VERTEX_STATE_PROGRAM_NV        0x8621
@@ -940,6 +942,7 @@ typedef void (APIENTRY * PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei cou
 typedef void (APIENTRY * PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
 typedef void (APIENTRY * PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
 typedef void (APIENTRY * PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
+#endif
 
 extern PFNGLAREPROGRAMSRESIDENTNVPROC qglAreProgramsResidentNV ;
 extern PFNGLBINDPROGRAMNVPROC qglBindProgramNV ;
@@ -1464,4 +1467,4 @@ qboolean IsShaderBlended(shader_t *s);
 
 void Roq_Info_f(void);
 void Roq_SetupTexture(gltexture_t *tex,char *filename);
-void Roq_FreeTexture(gltexture_t *tex);
\ No newline at end of file
+void Roq_FreeTexture(gltexture_t *tex);