From 2c8c9dbf1826d5967dbb5aebae127c0d8c5cae4b Mon Sep 17 00:00:00 2001 From: jpaana <> Date: Mon, 14 Jun 2004 02:33:15 +0000 Subject: [PATCH] Compile fixes for Linux --- glquake.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/glquake.h b/glquake.h index 9396d4c..be5435f 100644 --- a/glquake.h +++ b/glquake.h @@ -490,17 +490,16 @@ extern int occlusion_cut_lights; #define GL_DECR_WRAP_EXT 0x8508 #ifndef GL_EXT_stencil_two_side +#define GL_EXT_stencil_two_side 1 #define GL_STENCIL_TEST_TWO_SIDE_EXT 0x8910 #define GL_ACTIVE_STENCIL_FACE_EXT 0x8911 -#endif - -#ifndef GL_EXT_stencil_two_side -#define GL_EXT_stencil_two_side 1 typedef void (APIENTRY * PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face); #endif extern PFNGLACTIVESTENCILFACEEXTPROC qglActiveStencilFaceEXT; - -// ATI_separate_stencil + +// ATI_separate_stencil +#ifndef GL_ATI_separate_stencil +#define GL_ATI_separate_stencil 1 #define GL_STENCIL_BACK_FUNC_ATI 0x8800 #define GL_STENCIL_BACK_FAIL_ATI 0x8801 #define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802 @@ -508,6 +507,7 @@ extern PFNGLACTIVESTENCILFACEEXTPROC qglActiveStencilFaceEXT; typedef void (APIENTRY *PFNGLSTENCILOPSEPARATEATIPROC)(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); typedef void (APIENTRY *PFNGLSTENCILFUNCSEPARATEATIPROC)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); +#endif extern PFNGLSTENCILOPSEPARATEATIPROC qglStencilOpSeparateATI; extern PFNGLSTENCILFUNCSEPARATEATIPROC qglStencilFuncSeparateATI; @@ -1005,7 +1005,8 @@ extern PFNGLVERTEXATTRIBS4SVNVPROC qglVertexAttribs4svNV ; extern PFNGLVERTEXATTRIBS4UBVNVPROC qglVertexAttribs4ubvNV ; /* GL_ARB_vertex_buffer_object */ - +#ifndef GL_ARB_vertex_buffer_object +#define GL_ARB_vertex_buffer_object 1 #define GL_BUFFER_SIZE_ARB 0x8764 #define GL_BUFFER_USAGE_ARB 0x8765 #define GL_ARRAY_BUFFER_ARB 0x8892 @@ -1052,6 +1053,7 @@ typedef GLvoid* (APIENTRY * PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access typedef GLboolean (APIENTRY * PFNGLUNMAPBUFFERARBPROC) (GLenum target); typedef void (APIENTRY * PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params); typedef void (APIENTRY * PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params); +#endif extern PFNGLBINDBUFFERARBPROC qglBindBufferARB; extern PFNGLDELETEBUFFERSARBPROC qglDeleteBuffersARB; @@ -1075,7 +1077,7 @@ extern PFNGLGETBUFFERPOINTERVARBPROC qglGetBufferPointervARB; extern qboolean gl_mtexable; extern qboolean gl_texturefilteranisotropic; // true if anisotropic texture filtering available. -extern int gl_twosidedstencil; +extern int gl_twosidedstencil; typedef enum {