diff --git a/Makefile b/Makefile index 871a691..d7e2ab0 100644 --- a/Makefile +++ b/Makefile @@ -325,7 +325,7 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu")) LIBS=-ldl -lm CLIENT_LIBS=$(SDL_LIBS) - RENDERER_LIBS = $(SDL_LIBS) -lGL + RENDERER_LIBS = $(SDL_LIBS) -lGLEW -lGL ifeq ($(USE_OPENAL),1) ifneq ($(USE_OPENAL_DLOPEN),1) @@ -487,7 +487,7 @@ ifeq ($(PLATFORM),mingw32) LIBS= -lws2_32 -lwinmm -lpsapi CLIENT_LDFLAGS += -mwindows CLIENT_LIBS = -lgdi32 -lole32 - RENDERER_LIBS = -lgdi32 -lole32 -lopengl32 + RENDERER_LIBS = -lGLEW -lgdi32 -lole32 -lopengl32 ifeq ($(USE_CURL),1) CLIENT_CFLAGS += $(CURL_CFLAGS) @@ -570,7 +570,7 @@ ifeq ($(PLATFORM),freebsd) CLIENT_LIBS = CLIENT_LIBS += $(SDL_LIBS) - RENDERER_LIBS = $(SDL_LIBS) -lGL + RENDERER_LIBS = $(SDL_LIBS) -lGLEW -lGL # optional features/libraries ifeq ($(USE_OPENAL),1) @@ -631,7 +631,7 @@ ifeq ($(PLATFORM),openbsd) CLIENT_LIBS = CLIENT_LIBS += $(SDL_LIBS) - RENDERER_LIBS = $(SDL_LIBS) -lGL + RENDERER_LIBS = $(SDL_LIBS) -lGLEW -lGL ifeq ($(USE_OPENAL),1) ifneq ($(USE_OPENAL_DLOPEN),1) @@ -701,7 +701,7 @@ ifeq ($(PLATFORM),irix64) # FIXME: The X libraries probably aren't necessary? CLIENT_LIBS=-L/usr/X11/$(LIB) $(SDL_LIBS) \ -lX11 -lXext -lm - RENDERER_LIBS = $(SDL_LIBS) -lGL + RENDERER_LIBS = $(SDL_LIBS) -lGLEW -lGL else # ifeq IRIX @@ -763,7 +763,7 @@ ifeq ($(PLATFORM),sunos) BOTCFLAGS=-O0 CLIENT_LIBS +=$(SDL_LIBS) -lX11 -lXext -liconv -lm - RENDERER_LIBS = $(SDL_LIBS) -lGL + RENDERER_LIBS = $(SDL_LIBS) -lGLEW -lGL else # ifeq sunos diff --git a/code/null/null_glimp.c b/code/null/null_glimp.c index c9a9d73..22c782b 100644 --- a/code/null/null_glimp.c +++ b/code/null/null_glimp.c @@ -22,16 +22,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../renderer/tr_local.h" -qboolean ( * qwglSwapIntervalEXT)( int interval ); -void ( * qglMultiTexCoord2fARB )( GLenum texture, float s, float t ); -void ( * qglActiveTextureARB )( GLenum texture ); -void ( * qglClientActiveTextureARB )( GLenum texture ); - - -void ( * qglLockArraysEXT)( int, int); -void ( * qglUnlockArraysEXT) ( void ); - - void GLimp_EndFrame( void ) { } diff --git a/code/renderer/qgl.h b/code/renderer/qgl.h deleted file mode 100644 index 5296193..0000000 --- a/code/renderer/qgl.h +++ /dev/null @@ -1,380 +0,0 @@ -/* -=========================================================================== -Copyright (C) 1999-2005 Id Software, Inc. - -This file is part of Quake III Arena source code. - -Quake III Arena source code is free software; you can redistribute it -and/or modify it under the terms of the GNU General Public License as -published by the Free Software Foundation; either version 2 of the License, -or (at your option) any later version. - -Quake III Arena source code is distributed in the hope that it will be -useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Quake III Arena source code; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -=========================================================================== -*/ -/* -** QGL.H -*/ - -#ifndef __QGL_H__ -#define __QGL_H__ - -#ifdef USE_LOCAL_HEADERS -# include "SDL_opengl.h" -#else -# include -#endif - -extern void (APIENTRYP qglActiveTextureARB) (GLenum texture); -extern void (APIENTRYP qglClientActiveTextureARB) (GLenum texture); -extern void (APIENTRYP qglMultiTexCoord2fARB) (GLenum target, GLfloat s, GLfloat t); - -extern void (APIENTRYP qglLockArraysEXT) (GLint first, GLsizei count); -extern void (APIENTRYP qglUnlockArraysEXT) (void); - - -//=========================================================================== - -#define qglAccum glAccum -#define qglAlphaFunc glAlphaFunc -#define qglAreTexturesResident glAreTexturesResident -#define qglArrayElement glArrayElement -#define qglBegin glBegin -#define qglBindTexture glBindTexture -#define qglBitmap glBitmap -#define qglBlendFunc glBlendFunc -#define qglCallList glCallList -#define qglCallLists glCallLists -#define qglClear glClear -#define qglClearAccum glClearAccum -#define qglClearColor glClearColor -#define qglClearDepth glClearDepth -#define qglClearIndex glClearIndex -#define qglClearStencil glClearStencil -#define qglClipPlane glClipPlane -#define qglColor3b glColor3b -#define qglColor3bv glColor3bv -#define qglColor3d glColor3d -#define qglColor3dv glColor3dv -#define qglColor3f glColor3f -#define qglColor3fv glColor3fv -#define qglColor3i glColor3i -#define qglColor3iv glColor3iv -#define qglColor3s glColor3s -#define qglColor3sv glColor3sv -#define qglColor3ub glColor3ub -#define qglColor3ubv glColor3ubv -#define qglColor3ui glColor3ui -#define qglColor3uiv glColor3uiv -#define qglColor3us glColor3us -#define qglColor3usv glColor3usv -#define qglColor4b glColor4b -#define qglColor4bv glColor4bv -#define qglColor4d glColor4d -#define qglColor4dv glColor4dv -#define qglColor4f glColor4f -#define qglColor4fv glColor4fv -#define qglColor4i glColor4i -#define qglColor4iv glColor4iv -#define qglColor4s glColor4s -#define qglColor4sv glColor4sv -#define qglColor4ub glColor4ub -#define qglColor4ubv glColor4ubv -#define qglColor4ui glColor4ui -#define qglColor4uiv glColor4uiv -#define qglColor4us glColor4us -#define qglColor4usv glColor4usv -#define qglColorMask glColorMask -#define qglColorMaterial glColorMaterial -#define qglColorPointer glColorPointer -#define qglCopyPixels glCopyPixels -#define qglCopyTexImage1D glCopyTexImage1D -#define qglCopyTexImage2D glCopyTexImage2D -#define qglCopyTexSubImage1D glCopyTexSubImage1D -#define qglCopyTexSubImage2D glCopyTexSubImage2D -#define qglCullFace glCullFace -#define qglDeleteLists glDeleteLists -#define qglDeleteTextures glDeleteTextures -#define qglDepthFunc glDepthFunc -#define qglDepthMask glDepthMask -#define qglDepthRange glDepthRange -#define qglDisable glDisable -#define qglDisableClientState glDisableClientState -#define qglDrawArrays glDrawArrays -#define qglDrawBuffer glDrawBuffer -#define qglDrawElements glDrawElements -#define qglDrawPixels glDrawPixels -#define qglEdgeFlag glEdgeFlag -#define qglEdgeFlagPointer glEdgeFlagPointer -#define qglEdgeFlagv glEdgeFlagv -#define qglEnable glEnable -#define qglEnableClientState glEnableClientState -#define qglEnd glEnd -#define qglEndList glEndList -#define qglEvalCoord1d glEvalCoord1d -#define qglEvalCoord1dv glEvalCoord1dv -#define qglEvalCoord1f glEvalCoord1f -#define qglEvalCoord1fv glEvalCoord1fv -#define qglEvalCoord2d glEvalCoord2d -#define qglEvalCoord2dv glEvalCoord2dv -#define qglEvalCoord2f glEvalCoord2f -#define qglEvalCoord2fv glEvalCoord2fv -#define qglEvalMesh1 glEvalMesh1 -#define qglEvalMesh2 glEvalMesh2 -#define qglEvalPoint1 glEvalPoint1 -#define qglEvalPoint2 glEvalPoint2 -#define qglFeedbackBuffer glFeedbackBuffer -#define qglFinish glFinish -#define qglFlush glFlush -#define qglFogf glFogf -#define qglFogfv glFogfv -#define qglFogi glFogi -#define qglFogiv glFogiv -#define qglFrontFace glFrontFace -#define qglFrustum glFrustum -#define qglGenLists glGenLists -#define qglGenTextures glGenTextures -#define qglGetBooleanv glGetBooleanv -#define qglGetClipPlane glGetClipPlane -#define qglGetDoublev glGetDoublev -#define qglGetError glGetError -#define qglGetFloatv glGetFloatv -#define qglGetIntegerv glGetIntegerv -#define qglGetLightfv glGetLightfv -#define qglGetLightiv glGetLightiv -#define qglGetMapdv glGetMapdv -#define qglGetMapfv glGetMapfv -#define qglGetMapiv glGetMapiv -#define qglGetMaterialfv glGetMaterialfv -#define qglGetMaterialiv glGetMaterialiv -#define qglGetPixelMapfv glGetPixelMapfv -#define qglGetPixelMapuiv glGetPixelMapuiv -#define qglGetPixelMapusv glGetPixelMapusv -#define qglGetPointerv glGetPointerv -#define qglGetPolygonStipple glGetPolygonStipple -#define qglGetString glGetString -#define qglGetTexGendv glGetTexGendv -#define qglGetTexGenfv glGetTexGenfv -#define qglGetTexGeniv glGetTexGeniv -#define qglGetTexImage glGetTexImage -#define qglGetTexLevelParameterfv glGetTexLevelParameterfv -#define qglGetTexLevelParameteriv glGetTexLevelParameteriv -#define qglGetTexParameterfv glGetTexParameterfv -#define qglGetTexParameteriv glGetTexParameteriv -#define qglHint glHint -#define qglIndexMask glIndexMask -#define qglIndexPointer glIndexPointer -#define qglIndexd glIndexd -#define qglIndexdv glIndexdv -#define qglIndexf glIndexf -#define qglIndexfv glIndexfv -#define qglIndexi glIndexi -#define qglIndexiv glIndexiv -#define qglIndexs glIndexs -#define qglIndexsv glIndexsv -#define qglIndexub glIndexub -#define qglIndexubv glIndexubv -#define qglInitNames glInitNames -#define qglInterleavedArrays glInterleavedArrays -#define qglIsEnabled glIsEnabled -#define qglIsList glIsList -#define qglIsTexture glIsTexture -#define qglLightModelf glLightModelf -#define qglLightModelfv glLightModelfv -#define qglLightModeli glLightModeli -#define qglLightModeliv glLightModeliv -#define qglLightf glLightf -#define qglLightfv glLightfv -#define qglLighti glLighti -#define qglLightiv glLightiv -#define qglLineStipple glLineStipple -#define qglLineWidth glLineWidth -#define qglListBase glListBase -#define qglLoadIdentity glLoadIdentity -#define qglLoadMatrixd glLoadMatrixd -#define qglLoadMatrixf glLoadMatrixf -#define qglLoadName glLoadName -#define qglLogicOp glLogicOp -#define qglMap1d glMap1d -#define qglMap1f glMap1f -#define qglMap2d glMap2d -#define qglMap2f glMap2f -#define qglMapGrid1d glMapGrid1d -#define qglMapGrid1f glMapGrid1f -#define qglMapGrid2d glMapGrid2d -#define qglMapGrid2f glMapGrid2f -#define qglMaterialf glMaterialf -#define qglMaterialfv glMaterialfv -#define qglMateriali glMateriali -#define qglMaterialiv glMaterialiv -#define qglMatrixMode glMatrixMode -#define qglMultMatrixd glMultMatrixd -#define qglMultMatrixf glMultMatrixf -#define qglNewList glNewList -#define qglNormal3b glNormal3b -#define qglNormal3bv glNormal3bv -#define qglNormal3d glNormal3d -#define qglNormal3dv glNormal3dv -#define qglNormal3f glNormal3f -#define qglNormal3fv glNormal3fv -#define qglNormal3i glNormal3i -#define qglNormal3iv glNormal3iv -#define qglNormal3s glNormal3s -#define qglNormal3sv glNormal3sv -#define qglNormalPointer glNormalPointer -#define qglOrtho glOrtho -#define qglPassThrough glPassThrough -#define qglPixelMapfv glPixelMapfv -#define qglPixelMapuiv glPixelMapuiv -#define qglPixelMapusv glPixelMapusv -#define qglPixelStoref glPixelStoref -#define qglPixelStorei glPixelStorei -#define qglPixelTransferf glPixelTransferf -#define qglPixelTransferi glPixelTransferi -#define qglPixelZoom glPixelZoom -#define qglPointSize glPointSize -#define qglPolygonMode glPolygonMode -#define qglPolygonOffset glPolygonOffset -#define qglPolygonStipple glPolygonStipple -#define qglPopAttrib glPopAttrib -#define qglPopClientAttrib glPopClientAttrib -#define qglPopMatrix glPopMatrix -#define qglPopName glPopName -#define qglPrioritizeTextures glPrioritizeTextures -#define qglPushAttrib glPushAttrib -#define qglPushClientAttrib glPushClientAttrib -#define qglPushMatrix glPushMatrix -#define qglPushName glPushName -#define qglRasterPos2d glRasterPos2d -#define qglRasterPos2dv glRasterPos2dv -#define qglRasterPos2f glRasterPos2f -#define qglRasterPos2fv glRasterPos2fv -#define qglRasterPos2i glRasterPos2i -#define qglRasterPos2iv glRasterPos2iv -#define qglRasterPos2s glRasterPos2s -#define qglRasterPos2sv glRasterPos2sv -#define qglRasterPos3d glRasterPos3d -#define qglRasterPos3dv glRasterPos3dv -#define qglRasterPos3f glRasterPos3f -#define qglRasterPos3fv glRasterPos3fv -#define qglRasterPos3i glRasterPos3i -#define qglRasterPos3iv glRasterPos3iv -#define qglRasterPos3s glRasterPos3s -#define qglRasterPos3sv glRasterPos3sv -#define qglRasterPos4d glRasterPos4d -#define qglRasterPos4dv glRasterPos4dv -#define qglRasterPos4f glRasterPos4f -#define qglRasterPos4fv glRasterPos4fv -#define qglRasterPos4i glRasterPos4i -#define qglRasterPos4iv glRasterPos4iv -#define qglRasterPos4s glRasterPos4s -#define qglRasterPos4sv glRasterPos4sv -#define qglReadBuffer glReadBuffer -#define qglReadPixels glReadPixels -#define qglRectd glRectd -#define qglRectdv glRectdv -#define qglRectf glRectf -#define qglRectfv glRectfv -#define qglRecti glRecti -#define qglRectiv glRectiv -#define qglRects glRects -#define qglRectsv glRectsv -#define qglRenderMode glRenderMode -#define qglRotated glRotated -#define qglRotatef glRotatef -#define qglScaled glScaled -#define qglScalef glScalef -#define qglScissor glScissor -#define qglSelectBuffer glSelectBuffer -#define qglShadeModel glShadeModel -#define qglStencilFunc glStencilFunc -#define qglStencilMask glStencilMask -#define qglStencilOp glStencilOp -#define qglTexCoord1d glTexCoord1d -#define qglTexCoord1dv glTexCoord1dv -#define qglTexCoord1f glTexCoord1f -#define qglTexCoord1fv glTexCoord1fv -#define qglTexCoord1i glTexCoord1i -#define qglTexCoord1iv glTexCoord1iv -#define qglTexCoord1s glTexCoord1s -#define qglTexCoord1sv glTexCoord1sv -#define qglTexCoord2d glTexCoord2d -#define qglTexCoord2dv glTexCoord2dv -#define qglTexCoord2f glTexCoord2f -#define qglTexCoord2fv glTexCoord2fv -#define qglTexCoord2i glTexCoord2i -#define qglTexCoord2iv glTexCoord2iv -#define qglTexCoord2s glTexCoord2s -#define qglTexCoord2sv glTexCoord2sv -#define qglTexCoord3d glTexCoord3d -#define qglTexCoord3dv glTexCoord3dv -#define qglTexCoord3f glTexCoord3f -#define qglTexCoord3fv glTexCoord3fv -#define qglTexCoord3i glTexCoord3i -#define qglTexCoord3iv glTexCoord3iv -#define qglTexCoord3s glTexCoord3s -#define qglTexCoord3sv glTexCoord3sv -#define qglTexCoord4d glTexCoord4d -#define qglTexCoord4dv glTexCoord4dv -#define qglTexCoord4f glTexCoord4f -#define qglTexCoord4fv glTexCoord4fv -#define qglTexCoord4i glTexCoord4i -#define qglTexCoord4iv glTexCoord4iv -#define qglTexCoord4s glTexCoord4s -#define qglTexCoord4sv glTexCoord4sv -#define qglTexCoordPointer glTexCoordPointer -#define qglTexEnvf glTexEnvf -#define qglTexEnvfv glTexEnvfv -#define qglTexEnvi glTexEnvi -#define qglTexEnviv glTexEnviv -#define qglTexGend glTexGend -#define qglTexGendv glTexGendv -#define qglTexGenf glTexGenf -#define qglTexGenfv glTexGenfv -#define qglTexGeni glTexGeni -#define qglTexGeniv glTexGeniv -#define qglTexImage1D glTexImage1D -#define qglTexImage2D glTexImage2D -#define qglTexParameterf glTexParameterf -#define qglTexParameterfv glTexParameterfv -#define qglTexParameteri glTexParameteri -#define qglTexParameteriv glTexParameteriv -#define qglTexSubImage1D glTexSubImage1D -#define qglTexSubImage2D glTexSubImage2D -#define qglTranslated glTranslated -#define qglTranslatef glTranslatef -#define qglVertex2d glVertex2d -#define qglVertex2dv glVertex2dv -#define qglVertex2f glVertex2f -#define qglVertex2fv glVertex2fv -#define qglVertex2i glVertex2i -#define qglVertex2iv glVertex2iv -#define qglVertex2s glVertex2s -#define qglVertex2sv glVertex2sv -#define qglVertex3d glVertex3d -#define qglVertex3dv glVertex3dv -#define qglVertex3f glVertex3f -#define qglVertex3fv glVertex3fv -#define qglVertex3i glVertex3i -#define qglVertex3iv glVertex3iv -#define qglVertex3s glVertex3s -#define qglVertex3sv glVertex3sv -#define qglVertex4d glVertex4d -#define qglVertex4dv glVertex4dv -#define qglVertex4f glVertex4f -#define qglVertex4fv glVertex4fv -#define qglVertex4i glVertex4i -#define qglVertex4iv glVertex4iv -#define qglVertex4s glVertex4s -#define qglVertex4sv glVertex4sv -#define qglVertexPointer glVertexPointer -#define qglViewport glViewport - -#endif diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c index 2b630a4..8bc5882 100644 --- a/code/renderer/tr_backend.c +++ b/code/renderer/tr_backend.c @@ -55,7 +55,7 @@ void GL_Bind( image_t *image ) { if ( glState.currenttextures[glState.currenttmu] != texnum ) { image->frameUsed = tr.frameCount; glState.currenttextures[glState.currenttmu] = texnum; - qglBindTexture (GL_TEXTURE_2D, texnum); + glBindTexture (GL_TEXTURE_2D, texnum); } } @@ -71,16 +71,16 @@ void GL_SelectTexture( int unit ) if ( unit == 0 ) { - qglActiveTextureARB( GL_TEXTURE0_ARB ); + glActiveTextureARB( GL_TEXTURE0_ARB ); GLimp_LogComment( "glActiveTextureARB( GL_TEXTURE0_ARB )\n" ); - qglClientActiveTextureARB( GL_TEXTURE0_ARB ); + glClientActiveTextureARB( GL_TEXTURE0_ARB ); GLimp_LogComment( "glClientActiveTextureARB( GL_TEXTURE0_ARB )\n" ); } else if ( unit == 1 ) { - qglActiveTextureARB( GL_TEXTURE1_ARB ); + glActiveTextureARB( GL_TEXTURE1_ARB ); GLimp_LogComment( "glActiveTextureARB( GL_TEXTURE1_ARB )\n" ); - qglClientActiveTextureARB( GL_TEXTURE1_ARB ); + glClientActiveTextureARB( GL_TEXTURE1_ARB ); GLimp_LogComment( "glClientActiveTextureARB( GL_TEXTURE1_ARB )\n" ); } else { ri.Error( ERR_DROP, "GL_SelectTexture: unit = %i", unit ); @@ -107,13 +107,13 @@ void GL_BindMultitexture( image_t *image0, GLuint env0, image_t *image1, GLuint GL_SelectTexture( 1 ); image1->frameUsed = tr.frameCount; glState.currenttextures[1] = texnum1; - qglBindTexture( GL_TEXTURE_2D, texnum1 ); + glBindTexture( GL_TEXTURE_2D, texnum1 ); } if ( glState.currenttextures[0] != texnum0 ) { GL_SelectTexture( 0 ); image0->frameUsed = tr.frameCount; glState.currenttextures[0] = texnum0; - qglBindTexture( GL_TEXTURE_2D, texnum0 ); + glBindTexture( GL_TEXTURE_2D, texnum0 ); } } @@ -130,32 +130,32 @@ void GL_Cull( int cullType ) { if ( cullType == CT_TWO_SIDED ) { - qglDisable( GL_CULL_FACE ); + glDisable( GL_CULL_FACE ); } else { - qglEnable( GL_CULL_FACE ); + glEnable( GL_CULL_FACE ); if ( cullType == CT_BACK_SIDED ) { if ( backEnd.viewParms.isMirror ) { - qglCullFace( GL_FRONT ); + glCullFace( GL_FRONT ); } else { - qglCullFace( GL_BACK ); + glCullFace( GL_BACK ); } } else { if ( backEnd.viewParms.isMirror ) { - qglCullFace( GL_BACK ); + glCullFace( GL_BACK ); } else { - qglCullFace( GL_FRONT ); + glCullFace( GL_FRONT ); } } } @@ -177,16 +177,16 @@ void GL_TexEnv( int env ) switch ( env ) { case GL_MODULATE: - qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ); + glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ); break; case GL_REPLACE: - qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE ); + glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE ); break; case GL_DECAL: - qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL ); + glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL ); break; case GL_ADD: - qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_ADD ); + glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_ADD ); break; default: ri.Error( ERR_DROP, "GL_TexEnv: invalid env '%d' passed", env ); @@ -216,11 +216,11 @@ void GL_State( unsigned long stateBits ) { if ( stateBits & GLS_DEPTHFUNC_EQUAL ) { - qglDepthFunc( GL_EQUAL ); + glDepthFunc( GL_EQUAL ); } else { - qglDepthFunc( GL_LEQUAL ); + glDepthFunc( GL_LEQUAL ); } } @@ -300,12 +300,12 @@ void GL_State( unsigned long stateBits ) break; } - qglEnable( GL_BLEND ); - qglBlendFunc( srcFactor, dstFactor ); + glEnable( GL_BLEND ); + glBlendFunc( srcFactor, dstFactor ); } else { - qglDisable( GL_BLEND ); + glDisable( GL_BLEND ); } } @@ -316,11 +316,11 @@ void GL_State( unsigned long stateBits ) { if ( stateBits & GLS_DEPTHMASK_TRUE ) { - qglDepthMask( GL_TRUE ); + glDepthMask( GL_TRUE ); } else { - qglDepthMask( GL_FALSE ); + glDepthMask( GL_FALSE ); } } @@ -331,11 +331,11 @@ void GL_State( unsigned long stateBits ) { if ( stateBits & GLS_POLYMODE_LINE ) { - qglPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); + glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); } else { - qglPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); + glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); } } @@ -346,11 +346,11 @@ void GL_State( unsigned long stateBits ) { if ( stateBits & GLS_DEPTHTEST_DISABLE ) { - qglDisable( GL_DEPTH_TEST ); + glDisable( GL_DEPTH_TEST ); } else { - qglEnable( GL_DEPTH_TEST ); + glEnable( GL_DEPTH_TEST ); } } @@ -362,19 +362,19 @@ void GL_State( unsigned long stateBits ) switch ( stateBits & GLS_ATEST_BITS ) { case 0: - qglDisable( GL_ALPHA_TEST ); + glDisable( GL_ALPHA_TEST ); break; case GLS_ATEST_GT_0: - qglEnable( GL_ALPHA_TEST ); - qglAlphaFunc( GL_GREATER, 0.0f ); + glEnable( GL_ALPHA_TEST ); + glAlphaFunc( GL_GREATER, 0.0f ); break; case GLS_ATEST_LT_80: - qglEnable( GL_ALPHA_TEST ); - qglAlphaFunc( GL_LESS, 0.5f ); + glEnable( GL_ALPHA_TEST ); + glAlphaFunc( GL_LESS, 0.5f ); break; case GLS_ATEST_GE_80: - qglEnable( GL_ALPHA_TEST ); - qglAlphaFunc( GL_GEQUAL, 0.5f ); + glEnable( GL_ALPHA_TEST ); + glAlphaFunc( GL_GEQUAL, 0.5f ); break; default: assert( 0 ); @@ -402,22 +402,22 @@ static void RB_Hyperspace( void ) { } c = ( backEnd.refdef.time & 255 ) / 255.0f; - qglClearColor( c, c, c, 1 ); - qglClear( GL_COLOR_BUFFER_BIT ); + glClearColor( c, c, c, 1 ); + glClear( GL_COLOR_BUFFER_BIT ); backEnd.isHyperspace = qtrue; } static void SetViewportAndScissor( void ) { - qglMatrixMode(GL_PROJECTION); - qglLoadMatrixf( backEnd.viewParms.projectionMatrix ); - qglMatrixMode(GL_MODELVIEW); + glMatrixMode(GL_PROJECTION); + glLoadMatrixf( backEnd.viewParms.projectionMatrix ); + glMatrixMode(GL_MODELVIEW); // set the window clipping - qglViewport( backEnd.viewParms.viewportX, backEnd.viewParms.viewportY, + glViewport( backEnd.viewParms.viewportX, backEnd.viewParms.viewportY, backEnd.viewParms.viewportWidth, backEnd.viewParms.viewportHeight ); - qglScissor( backEnd.viewParms.viewportX, backEnd.viewParms.viewportY, + glScissor( backEnd.viewParms.viewportX, backEnd.viewParms.viewportY, backEnd.viewParms.viewportWidth, backEnd.viewParms.viewportHeight ); } @@ -434,7 +434,7 @@ void RB_BeginDrawingView (void) { // sync with gl if needed if ( r_finish->integer == 1 && !glState.finishCalled ) { - qglFinish (); + glFinish (); glState.finishCalled = qtrue; } if ( r_finish->integer == 0 ) { @@ -458,12 +458,12 @@ void RB_BeginDrawingView (void) { { clearBits |= GL_COLOR_BUFFER_BIT; // FIXME: only if sky shaders have been used #ifdef _DEBUG - qglClearColor( 0.8f, 0.7f, 0.4f, 1.0f ); // FIXME: get color of sky + glClearColor( 0.8f, 0.7f, 0.4f, 1.0f ); // FIXME: get color of sky #else - qglClearColor( 0.0f, 0.0f, 0.0f, 1.0f ); // FIXME: get color of sky + glClearColor( 0.0f, 0.0f, 0.0f, 1.0f ); // FIXME: get color of sky #endif } - qglClear( clearBits ); + glClear( clearBits ); // // set the modelview matrix for the viewer @@ -500,11 +500,11 @@ void RB_BeginDrawingView (void) { plane2[2] = DotProduct (backEnd.viewParms.or.axis[2], plane); plane2[3] = DotProduct (plane, backEnd.viewParms.or.origin) - plane[3]; - qglLoadMatrixf( s_flipMatrix ); - qglClipPlane (GL_CLIP_PLANE0, plane2); - qglEnable (GL_CLIP_PLANE0); + glLoadMatrixf( s_flipMatrix ); + glClipPlane (GL_CLIP_PLANE0, plane2); + glEnable (GL_CLIP_PLANE0); } else { - qglDisable (GL_CLIP_PLANE0); + glDisable (GL_CLIP_PLANE0); } } @@ -609,7 +609,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) { R_TransformDlights( backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.or ); } - qglLoadMatrixf( backEnd.or.modelMatrix ); + glLoadMatrixf( backEnd.or.modelMatrix ); // // change depthrange. Also change projection matrix so first person weapon does not look like coming @@ -626,9 +626,9 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) { if(oldDepthRange) { // was not a crosshair but now is, change back proj matrix - qglMatrixMode(GL_PROJECTION); - qglLoadMatrixf(backEnd.viewParms.projectionMatrix); - qglMatrixMode(GL_MODELVIEW); + glMatrixMode(GL_PROJECTION); + glLoadMatrixf(backEnd.viewParms.projectionMatrix); + glMatrixMode(GL_MODELVIEW); } } else @@ -637,25 +637,25 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) { R_SetupProjection(&temp, r_znear->value, qfalse); - qglMatrixMode(GL_PROJECTION); - qglLoadMatrixf(temp.projectionMatrix); - qglMatrixMode(GL_MODELVIEW); + glMatrixMode(GL_PROJECTION); + glLoadMatrixf(temp.projectionMatrix); + glMatrixMode(GL_MODELVIEW); } } if(!oldDepthRange) - qglDepthRange (0, 0.3); + glDepthRange (0, 0.3); } else { if(!wasCrosshair && backEnd.viewParms.stereoFrame != STEREO_CENTER) { - qglMatrixMode(GL_PROJECTION); - qglLoadMatrixf(backEnd.viewParms.projectionMatrix); - qglMatrixMode(GL_MODELVIEW); + glMatrixMode(GL_PROJECTION); + glLoadMatrixf(backEnd.viewParms.projectionMatrix); + glMatrixMode(GL_MODELVIEW); } - qglDepthRange (0, 1); + glDepthRange (0, 1); } oldDepthRange = depthRange; @@ -677,9 +677,9 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) { } // go back to the world modelview matrix - qglLoadMatrixf( backEnd.viewParms.world.modelMatrix ); + glLoadMatrixf( backEnd.viewParms.world.modelMatrix ); if ( depthRange ) { - qglDepthRange (0, 1); + glDepthRange (0, 1); } #if 0 @@ -711,20 +711,20 @@ void RB_SetGL2D (void) { backEnd.projection2D = qtrue; // set 2D virtual screen size - qglViewport( 0, 0, glConfig.vidWidth, glConfig.vidHeight ); - qglScissor( 0, 0, glConfig.vidWidth, glConfig.vidHeight ); - qglMatrixMode(GL_PROJECTION); - qglLoadIdentity (); - qglOrtho (0, glConfig.vidWidth, glConfig.vidHeight, 0, 0, 1); - qglMatrixMode(GL_MODELVIEW); - qglLoadIdentity (); + glViewport( 0, 0, glConfig.vidWidth, glConfig.vidHeight ); + glScissor( 0, 0, glConfig.vidWidth, glConfig.vidHeight ); + glMatrixMode(GL_PROJECTION); + glLoadIdentity (); + glOrtho (0, glConfig.vidWidth, glConfig.vidHeight, 0, 0, 1); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity (); GL_State( GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_SRC_ALPHA | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA ); - qglDisable( GL_CULL_FACE ); - qglDisable( GL_CLIP_PLANE0 ); + glDisable( GL_CULL_FACE ); + glDisable( GL_CLIP_PLANE0 ); // set time for 2D shaders backEnd.refdef.time = ri.Milliseconds(); @@ -751,7 +751,7 @@ void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte * R_SyncRenderThread(); // we definately want to sync every frame for the cinematics - qglFinish(); + glFinish(); start = 0; if ( r_speeds->integer ) { @@ -773,38 +773,38 @@ void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte * if ( cols != tr.scratchImage[client]->width || rows != tr.scratchImage[client]->height ) { tr.scratchImage[client]->width = tr.scratchImage[client]->uploadWidth = cols; tr.scratchImage[client]->height = tr.scratchImage[client]->uploadHeight = rows; - qglTexImage2D( GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data ); - qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); - qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); - qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); - qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data ); + glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); + glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); + glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); } else { if (dirty) { // otherwise, just subimage upload it so that drivers can tell we are going to be changing // it and don't try and do a texture compression - qglTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, cols, rows, GL_RGBA, GL_UNSIGNED_BYTE, data ); + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, cols, rows, GL_RGBA, GL_UNSIGNED_BYTE, data ); } } if ( r_speeds->integer ) { end = ri.Milliseconds(); - ri.Printf( PRINT_ALL, "qglTexSubImage2D %i, %i: %i msec\n", cols, rows, end - start ); + ri.Printf( PRINT_ALL, "glTexSubImage2D %i, %i: %i msec\n", cols, rows, end - start ); } RB_SetGL2D(); - qglColor3f( tr.identityLight, tr.identityLight, tr.identityLight ); - - qglBegin (GL_QUADS); - qglTexCoord2f ( 0.5f / cols, 0.5f / rows ); - qglVertex2f (x, y); - qglTexCoord2f ( ( cols - 0.5f ) / cols , 0.5f / rows ); - qglVertex2f (x+w, y); - qglTexCoord2f ( ( cols - 0.5f ) / cols, ( rows - 0.5f ) / rows ); - qglVertex2f (x+w, y+h); - qglTexCoord2f ( 0.5f / cols, ( rows - 0.5f ) / rows ); - qglVertex2f (x, y+h); - qglEnd (); + glColor3f( tr.identityLight, tr.identityLight, tr.identityLight ); + + glBegin (GL_QUADS); + glTexCoord2f ( 0.5f / cols, 0.5f / rows ); + glVertex2f (x, y); + glTexCoord2f ( ( cols - 0.5f ) / cols , 0.5f / rows ); + glVertex2f (x+w, y); + glTexCoord2f ( ( cols - 0.5f ) / cols, ( rows - 0.5f ) / rows ); + glVertex2f (x+w, y+h); + glTexCoord2f ( 0.5f / cols, ( rows - 0.5f ) / rows ); + glVertex2f (x, y+h); + glEnd (); } void RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int client, qboolean dirty) { @@ -815,16 +815,16 @@ void RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int if ( cols != tr.scratchImage[client]->width || rows != tr.scratchImage[client]->height ) { tr.scratchImage[client]->width = tr.scratchImage[client]->uploadWidth = cols; tr.scratchImage[client]->height = tr.scratchImage[client]->uploadHeight = rows; - qglTexImage2D( GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data ); - qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); - qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); - qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); - qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data ); + glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); + glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); + glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); } else { if (dirty) { // otherwise, just subimage upload it so that drivers can tell we are going to be changing // it and don't try and do a texture compression - qglTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, cols, rows, GL_RGBA, GL_UNSIGNED_BYTE, data ); + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, cols, rows, GL_RGBA, GL_UNSIGNED_BYTE, data ); } } } @@ -961,12 +961,12 @@ const void *RB_DrawBuffer( const void *data ) { cmd = (const drawBufferCommand_t *)data; - qglDrawBuffer( cmd->buffer ); + glDrawBuffer( cmd->buffer ); // clear screen for debugging if ( r_clear->integer ) { - qglClearColor( 1, 0, 0.5, 1 ); - qglClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + glClearColor( 1, 0, 0.5, 1 ); + glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); } return (const void *)(cmd + 1); @@ -992,9 +992,9 @@ void RB_ShowImages( void ) { RB_SetGL2D(); } - qglClear( GL_COLOR_BUFFER_BIT ); + glClear( GL_COLOR_BUFFER_BIT ); - qglFinish(); + glFinish(); start = ri.Milliseconds(); @@ -1013,19 +1013,19 @@ void RB_ShowImages( void ) { } GL_Bind( image ); - qglBegin (GL_QUADS); - qglTexCoord2f( 0, 0 ); - qglVertex2f( x, y ); - qglTexCoord2f( 1, 0 ); - qglVertex2f( x + w, y ); - qglTexCoord2f( 1, 1 ); - qglVertex2f( x + w, y + h ); - qglTexCoord2f( 0, 1 ); - qglVertex2f( x, y + h ); - qglEnd(); + glBegin (GL_QUADS); + glTexCoord2f( 0, 0 ); + glVertex2f( x, y ); + glTexCoord2f( 1, 0 ); + glVertex2f( x + w, y ); + glTexCoord2f( 1, 1 ); + glVertex2f( x + w, y + h ); + glTexCoord2f( 0, 1 ); + glVertex2f( x, y + h ); + glEnd(); } - qglFinish(); + glFinish(); end = ri.Milliseconds(); ri.Printf( PRINT_ALL, "%i msec to draw all images\n", end - start ); @@ -1042,7 +1042,7 @@ const void *RB_ColorMask(const void *data) { const colorMaskCommand_t *cmd = data; - qglColorMask(cmd->rgba[0], cmd->rgba[1], cmd->rgba[2], cmd->rgba[3]); + glColorMask(cmd->rgba[0], cmd->rgba[1], cmd->rgba[2], cmd->rgba[3]); return (const void *)(cmd + 1); } @@ -1064,7 +1064,7 @@ const void *RB_ClearDepth(const void *data) if (r_showImages->integer) RB_ShowImages(); - qglClear(GL_DEPTH_BUFFER_BIT); + glClear(GL_DEPTH_BUFFER_BIT); return (const void *)(cmd + 1); } @@ -1098,7 +1098,7 @@ const void *RB_SwapBuffers( const void *data ) { unsigned char *stencilReadback; stencilReadback = ri.Hunk_AllocateTempMemory( glConfig.vidWidth * glConfig.vidHeight ); - qglReadPixels( 0, 0, glConfig.vidWidth, glConfig.vidHeight, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, stencilReadback ); + glReadPixels( 0, 0, glConfig.vidWidth, glConfig.vidHeight, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, stencilReadback ); for ( i = 0; i < glConfig.vidWidth * glConfig.vidHeight; i++ ) { sum += stencilReadback[i]; @@ -1110,7 +1110,7 @@ const void *RB_SwapBuffers( const void *data ) { if ( !glState.finishCalled ) { - qglFinish(); + glFinish(); } GLimp_LogComment( "***************** RB_SwapBuffers *****************\n\n\n" ); diff --git a/code/renderer/tr_cmds.c b/code/renderer/tr_cmds.c index abcbe07..cc60e2f 100644 --- a/code/renderer/tr_cmds.c +++ b/code/renderer/tr_cmds.c @@ -367,11 +367,11 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) { else { R_SyncRenderThread(); - qglEnable( GL_STENCIL_TEST ); - qglStencilMask( ~0U ); - qglClearStencil( 0U ); - qglStencilFunc( GL_ALWAYS, 0U, ~0U ); - qglStencilOp( GL_KEEP, GL_INCR, GL_INCR ); + glEnable( GL_STENCIL_TEST ); + glStencilMask( ~0U ); + glClearStencil( 0U ); + glStencilFunc( GL_ALWAYS, 0U, ~0U ); + glStencilOp( GL_KEEP, GL_INCR, GL_INCR ); } r_measureOverdraw->modified = qfalse; } @@ -380,7 +380,7 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) { // this is only reached if it was on and is now off if ( r_measureOverdraw->modified ) { R_SyncRenderThread(); - qglDisable( GL_STENCIL_TEST ); + glDisable( GL_STENCIL_TEST ); } r_measureOverdraw->modified = qfalse; } @@ -410,7 +410,7 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) { int err; R_SyncRenderThread(); - if ((err = qglGetError()) != GL_NO_ERROR) + if ((err = glGetError()) != GL_NO_ERROR) ri.Error(ERR_FATAL, "RE_BeginFrame() - glGetError() failed (0x%x)!", err); } @@ -435,13 +435,13 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) { if(r_anaglyphMode->modified) { // clear both, front and backbuffer. - qglColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - qglClearColor(0.0f, 0.0f, 0.0f, 1.0f); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - qglDrawBuffer(GL_FRONT); - qglClear(GL_COLOR_BUFFER_BIT); - qglDrawBuffer(GL_BACK); - qglClear(GL_COLOR_BUFFER_BIT); + glDrawBuffer(GL_FRONT); + glClear(GL_COLOR_BUFFER_BIT); + glDrawBuffer(GL_BACK); + glClear(GL_COLOR_BUFFER_BIT); r_anaglyphMode->modified = qfalse; } @@ -487,7 +487,7 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) { if(r_anaglyphMode->modified) { - qglColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); r_anaglyphMode->modified = qfalse; } diff --git a/code/renderer/tr_flares.c b/code/renderer/tr_flares.c index 05b1835..01f91c9 100644 --- a/code/renderer/tr_flares.c +++ b/code/renderer/tr_flares.c @@ -270,7 +270,7 @@ void RB_TestFlare( flare_t *f ) { glState.finishCalled = qfalse; // read back the z buffer contents - qglReadPixels( f->windowX, f->windowY, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depth ); + glReadPixels( f->windowX, f->windowY, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depth ); screenZ = backEnd.viewParms.projectionMatrix[14] / ( ( 2*depth - 1 ) * backEnd.viewParms.projectionMatrix[11] - backEnd.viewParms.projectionMatrix[10] ); @@ -501,15 +501,15 @@ void RB_RenderFlares (void) { } if ( backEnd.viewParms.isPortal ) { - qglDisable (GL_CLIP_PLANE0); + glDisable (GL_CLIP_PLANE0); } - qglPushMatrix(); - qglLoadIdentity(); - qglMatrixMode( GL_PROJECTION ); - qglPushMatrix(); - qglLoadIdentity(); - qglOrtho( backEnd.viewParms.viewportX, backEnd.viewParms.viewportX + backEnd.viewParms.viewportWidth, + glPushMatrix(); + glLoadIdentity(); + glMatrixMode( GL_PROJECTION ); + glPushMatrix(); + glLoadIdentity(); + glOrtho( backEnd.viewParms.viewportX, backEnd.viewParms.viewportX + backEnd.viewParms.viewportWidth, backEnd.viewParms.viewportY, backEnd.viewParms.viewportY + backEnd.viewParms.viewportHeight, -99999, 99999 ); @@ -521,8 +521,8 @@ void RB_RenderFlares (void) { } } - qglPopMatrix(); - qglMatrixMode( GL_MODELVIEW ); - qglPopMatrix(); + glPopMatrix(); + glMatrixMode( GL_MODELVIEW ); + glPopMatrix(); } diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c index f511201..9e77c02 100644 --- a/code/renderer/tr_image.c +++ b/code/renderer/tr_image.c @@ -115,8 +115,8 @@ void GL_TextureMode( const char *string ) { glt = tr.images[ i ]; if ( glt->mipmap ) { GL_Bind (glt); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max); } } } @@ -680,7 +680,7 @@ static void Upload32( unsigned *data, ( scaled_height == height ) ) { if (!mipmap) { - qglTexImage2D (GL_TEXTURE_2D, 0, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data); + glTexImage2D (GL_TEXTURE_2D, 0, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data); *pUploadWidth = scaled_width; *pUploadHeight = scaled_height; *format = internalFormat; @@ -712,7 +712,7 @@ static void Upload32( unsigned *data, *pUploadHeight = scaled_height; *format = internalFormat; - qglTexImage2D (GL_TEXTURE_2D, 0, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaledBuffer ); + glTexImage2D (GL_TEXTURE_2D, 0, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaledBuffer ); if (mipmap) { @@ -734,7 +734,7 @@ static void Upload32( unsigned *data, R_BlendOverTexture( (byte *)scaledBuffer, scaled_width * scaled_height, mipBlendColors[miplevel] ); } - qglTexImage2D (GL_TEXTURE_2D, miplevel, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaledBuffer ); + glTexImage2D (GL_TEXTURE_2D, miplevel, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaledBuffer ); } } done: @@ -742,19 +742,19 @@ done: if (mipmap) { if ( textureFilterAnisotropic ) - qglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, (GLint)Com_Clamp( 1, maxAnisotropy, r_ext_max_anisotropy->integer ) ); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max); } else { if ( textureFilterAnisotropic ) - qglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1 ); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1 ); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); } GL_CheckErrors(); @@ -804,13 +804,13 @@ image_t *R_CreateImage( const char *name, const byte *pic, int width, int height image->wrapClampMode = glWrapClampMode; // lightmaps are always allocated on TMU 1 - if ( qglActiveTextureARB && isLightmap ) { + if ( GLEW_ARB_multitexture && isLightmap ) { image->TMU = 1; } else { image->TMU = 0; } - if ( qglActiveTextureARB ) { + if ( GLEW_ARB_multitexture ) { GL_SelectTexture( image->TMU ); } @@ -824,10 +824,10 @@ image_t *R_CreateImage( const char *name, const byte *pic, int width, int height &image->uploadWidth, &image->uploadHeight ); - qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glWrapClampMode ); - qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, glWrapClampMode ); + glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glWrapClampMode ); + glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, glWrapClampMode ); - qglBindTexture( GL_TEXTURE_2D, 0 ); + glBindTexture( GL_TEXTURE_2D, 0 ); if ( image->TMU == 1 ) { GL_SelectTexture( 0 ); @@ -1125,7 +1125,7 @@ static void R_CreateFogImage( void ) { borderColor[2] = 1.0; borderColor[3] = 1; - qglTexParameterfv( GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, borderColor ); + glTexParameterfv( GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, borderColor ); } /* @@ -1311,20 +1311,20 @@ void R_DeleteTextures( void ) { int i; for ( i=0; itexnum ); + glDeleteTextures( 1, &tr.images[i]->texnum ); } Com_Memset( tr.images, 0, sizeof( tr.images ) ); tr.numImages = 0; Com_Memset( glState.currenttextures, 0, sizeof( glState.currenttextures ) ); - if ( qglActiveTextureARB ) { + if ( GLEW_ARB_multitexture ) { GL_SelectTexture( 1 ); - qglBindTexture( GL_TEXTURE_2D, 0 ); + glBindTexture( GL_TEXTURE_2D, 0 ); GL_SelectTexture( 0 ); - qglBindTexture( GL_TEXTURE_2D, 0 ); + glBindTexture( GL_TEXTURE_2D, 0 ); } else { - qglBindTexture( GL_TEXTURE_2D, 0 ); + glBindTexture( GL_TEXTURE_2D, 0 ); } } diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c index 2b239d8..5e66d5b 100644 --- a/code/renderer/tr_init.c +++ b/code/renderer/tr_init.c @@ -197,7 +197,7 @@ static void InitOpenGL( void ) Q_strlwr( renderer_buffer ); // OpenGL driver constants - qglGetIntegerv( GL_MAX_TEXTURE_SIZE, &temp ); + glGetIntegerv( GL_MAX_TEXTURE_SIZE, &temp ); glConfig.maxTextureSize = temp; // stubbed or broken drivers may have reported 0... @@ -226,7 +226,7 @@ void GL_CheckErrors( void ) { int err; char s[64]; - err = qglGetError(); + err = glGetError(); if ( err == GL_NO_ERROR ) { return; } @@ -374,7 +374,7 @@ byte *RB_ReadPixels(int x, int y, int width, int height, size_t *offset, int *pa int padwidth, linelen; GLint packAlign; - qglGetIntegerv(GL_PACK_ALIGNMENT, &packAlign); + glGetIntegerv(GL_PACK_ALIGNMENT, &packAlign); linelen = width * 3; padwidth = PAD(linelen, packAlign); @@ -383,7 +383,7 @@ byte *RB_ReadPixels(int x, int y, int width, int height, size_t *offset, int *pa buffer = ri.Hunk_AllocateTempMemory(padwidth * height + *offset + packAlign - 1); bufstart = PADP((intptr_t) buffer + *offset, packAlign); - qglReadPixels(x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, bufstart); + glReadPixels(x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, bufstart); *offset = bufstart - buffer; *padlen = padwidth - linelen; @@ -769,7 +769,7 @@ const void *RB_TakeVideoFrameCmd( const void *data ) cmd = (const videoFrameCommand_t *)data; - qglGetIntegerv(GL_PACK_ALIGNMENT, &packAlign); + glGetIntegerv(GL_PACK_ALIGNMENT, &packAlign); linelen = cmd->width * 3; @@ -782,7 +782,7 @@ const void *RB_TakeVideoFrameCmd( const void *data ) cBuf = PADP(cmd->captureBuffer, packAlign); - qglReadPixels(0, 0, cmd->width, cmd->height, GL_RGB, + glReadPixels(0, 0, cmd->width, cmd->height, GL_RGB, GL_UNSIGNED_BYTE, cBuf); memcount = padwidth * cmd->height; @@ -838,44 +838,44 @@ const void *RB_TakeVideoFrameCmd( const void *data ) */ void GL_SetDefaultState( void ) { - qglClearDepth( 1.0f ); + glClearDepth( 1.0f ); - qglCullFace(GL_FRONT); + glCullFace(GL_FRONT); - qglColor4f (1,1,1,1); + glColor4f (1,1,1,1); // initialize downstream texture unit if we're running // in a multitexture environment - if ( qglActiveTextureARB ) { + if ( GLEW_ARB_multitexture ) { GL_SelectTexture( 1 ); GL_TextureMode( r_textureMode->string ); GL_TexEnv( GL_MODULATE ); - qglDisable( GL_TEXTURE_2D ); + glDisable( GL_TEXTURE_2D ); GL_SelectTexture( 0 ); } - qglEnable(GL_TEXTURE_2D); + glEnable(GL_TEXTURE_2D); GL_TextureMode( r_textureMode->string ); GL_TexEnv( GL_MODULATE ); - qglShadeModel( GL_SMOOTH ); - qglDepthFunc( GL_LEQUAL ); + glShadeModel( GL_SMOOTH ); + glDepthFunc( GL_LEQUAL ); // the vertex array is always enabled, but the color and texture // arrays are enabled and disabled around the compiled vertex array call - qglEnableClientState (GL_VERTEX_ARRAY); + glEnableClientState (GL_VERTEX_ARRAY); // // make sure our GL state vector is set correctly // glState.glStateBits = GLS_DEPTHTEST_DISABLE | GLS_DEPTHMASK_TRUE; - qglPolygonMode (GL_FRONT_AND_BACK, GL_FILL); - qglDepthMask( GL_TRUE ); - qglDisable( GL_DEPTH_TEST ); - qglEnable( GL_SCISSOR_TEST ); - qglDisable( GL_CULL_FACE ); - qglDisable( GL_BLEND ); + glPolygonMode (GL_FRONT_AND_BACK, GL_FILL); + glDepthMask( GL_TRUE ); + glDisable( GL_DEPTH_TEST ); + glEnable( GL_SCISSOR_TEST ); + glDisable( GL_CULL_FACE ); + glDisable( GL_BLEND ); } @@ -930,7 +930,7 @@ void GfxInfo_f( void ) ri.Printf( PRINT_ALL, "rendering primitives: " ); primitives = r_primitives->integer; if ( primitives == 0 ) { - if ( qglLockArraysEXT ) { + if ( GL_EXT_compiled_vertex_array ) { primitives = 2; } else { primitives = 1; @@ -950,8 +950,8 @@ void GfxInfo_f( void ) ri.Printf( PRINT_ALL, "texturemode: %s\n", r_textureMode->string ); ri.Printf( PRINT_ALL, "picmip: %d\n", r_picmip->integer ); ri.Printf( PRINT_ALL, "texture bits: %d\n", r_texturebits->integer ); - ri.Printf( PRINT_ALL, "multitexture: %s\n", enablestrings[qglActiveTextureARB != 0] ); - ri.Printf( PRINT_ALL, "compiled vertex arrays: %s\n", enablestrings[qglLockArraysEXT != 0 ] ); + ri.Printf( PRINT_ALL, "multitexture: %s\n", enablestrings[GLEW_ARB_multitexture] ); + ri.Printf( PRINT_ALL, "compiled vertex arrays: %s\n", enablestrings[GLEW_EXT_compiled_vertex_array] ); ri.Printf( PRINT_ALL, "texenv add: %s\n", enablestrings[glConfig.textureEnvAddAvailable != 0] ); ri.Printf( PRINT_ALL, "compressed textures: %s\n", enablestrings[glConfig.textureCompression!=TC_NONE] ); if ( r_vertexLight->integer || glConfig.hardwareType == GLHW_PERMEDIA2 ) @@ -1227,7 +1227,7 @@ void R_Init( void ) { R_InitFreeType(); - err = qglGetError(); + err = glGetError(); if ( err != GL_NO_ERROR ) ri.Printf (PRINT_ALL, "glGetError() = 0x%x\n", err); diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h index 3ecde44..ebaf6c9 100644 --- a/code/renderer/tr_local.h +++ b/code/renderer/tr_local.h @@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../qcommon/qfiles.h" #include "../qcommon/qcommon.h" #include "tr_public.h" -#include "qgl.h" +#include #include "iqm.h" #define GL_INDEX_TYPE GL_UNSIGNED_INT diff --git a/code/renderer/tr_main.c b/code/renderer/tr_main.c index b6c83ae..0a762a4 100644 --- a/code/renderer/tr_main.c +++ b/code/renderer/tr_main.c @@ -1321,23 +1321,23 @@ void R_DebugPolygon( int color, int numPoints, float *points ) { // draw solid shade - qglColor3f( color&1, (color>>1)&1, (color>>2)&1 ); - qglBegin( GL_POLYGON ); + glColor3f( color&1, (color>>1)&1, (color>>2)&1 ); + glBegin( GL_POLYGON ); for ( i = 0 ; i < numPoints ; i++ ) { - qglVertex3fv( points + i * 3 ); + glVertex3fv( points + i * 3 ); } - qglEnd(); + glEnd(); // draw wireframe outline GL_State( GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE | GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE ); - qglDepthRange( 0, 0 ); - qglColor3f( 1, 1, 1 ); - qglBegin( GL_POLYGON ); + glDepthRange( 0, 0 ); + glColor3f( 1, 1, 1 ); + glBegin( GL_POLYGON ); for ( i = 0 ; i < numPoints ; i++ ) { - qglVertex3fv( points + i * 3 ); + glVertex3fv( points + i * 3 ); } - qglEnd(); - qglDepthRange( 0, 1 ); + glEnd(); + glDepthRange( 0, 1 ); } /* diff --git a/code/renderer/tr_shade.c b/code/renderer/tr_shade.c index 04cef08..ce1fa54 100644 --- a/code/renderer/tr_shade.c +++ b/code/renderer/tr_shade.c @@ -40,15 +40,15 @@ R_ArrayElementDiscrete This is just for OpenGL conformance testing, it should never be the fastest ================ */ -static void APIENTRY R_ArrayElementDiscrete( GLint index ) { - qglColor4ubv( tess.svars.colors[ index ] ); +static void GLAPIENTRY R_ArrayElementDiscrete( GLint index ) { + glColor4ubv( tess.svars.colors[ index ] ); if ( glState.currenttmu ) { - qglMultiTexCoord2fARB( 0, tess.svars.texcoords[ 0 ][ index ][0], tess.svars.texcoords[ 0 ][ index ][1] ); - qglMultiTexCoord2fARB( 1, tess.svars.texcoords[ 1 ][ index ][0], tess.svars.texcoords[ 1 ][ index ][1] ); + glMultiTexCoord2fARB( 0, tess.svars.texcoords[ 0 ][ index ][0], tess.svars.texcoords[ 0 ][ index ][1] ); + glMultiTexCoord2fARB( 1, tess.svars.texcoords[ 1 ][ index ][0], tess.svars.texcoords[ 1 ][ index ][1] ); } else { - qglTexCoord2fv( tess.svars.texcoords[ 0 ][ index ] ); + glTexCoord2fv( tess.svars.texcoords[ 0 ][ index ] ); } - qglVertex3fv( tess.xyz[ index ] ); + glVertex3fv( tess.xyz[ index ] ); } /* @@ -59,7 +59,7 @@ R_DrawStripElements */ static int c_vertexes; // for seeing how long our average strips are static int c_begins; -static void R_DrawStripElements( int numIndexes, const glIndex_t *indexes, void ( APIENTRY *element )(GLint) ) { +static void R_DrawStripElements( int numIndexes, const glIndex_t *indexes, void ( GLAPIENTRY *element )(GLint) ) { int i; int last[3] = { -1, -1, -1 }; qboolean even; @@ -70,7 +70,7 @@ static void R_DrawStripElements( int numIndexes, const glIndex_t *indexes, void return; } - qglBegin( GL_TRIANGLE_STRIP ); + glBegin( GL_TRIANGLE_STRIP ); // prime the strip element( indexes[0] ); @@ -101,9 +101,9 @@ static void R_DrawStripElements( int numIndexes, const glIndex_t *indexes, void // a new one else { - qglEnd(); + glEnd(); - qglBegin( GL_TRIANGLE_STRIP ); + glBegin( GL_TRIANGLE_STRIP ); c_begins++; element( indexes[i+0] ); @@ -129,9 +129,9 @@ static void R_DrawStripElements( int numIndexes, const glIndex_t *indexes, void // a new one else { - qglEnd(); + glEnd(); - qglBegin( GL_TRIANGLE_STRIP ); + glBegin( GL_TRIANGLE_STRIP ); c_begins++; element( indexes[i+0] ); @@ -149,7 +149,7 @@ static void R_DrawStripElements( int numIndexes, const glIndex_t *indexes, void last[2] = indexes[i+2]; } - qglEnd(); + glEnd(); } @@ -170,7 +170,7 @@ static void R_DrawElements( int numIndexes, const glIndex_t *indexes ) { // default is to use triangles if compiled vertex arrays are present if ( primitives == 0 ) { - if ( qglLockArraysEXT ) { + if ( GLEW_EXT_compiled_vertex_array ) { primitives = 2; } else { primitives = 1; @@ -179,7 +179,7 @@ static void R_DrawElements( int numIndexes, const glIndex_t *indexes ) { if ( primitives == 2 ) { - qglDrawElements( GL_TRIANGLES, + glDrawElements( GL_TRIANGLES, numIndexes, GL_INDEX_TYPE, indexes ); @@ -187,7 +187,7 @@ static void R_DrawElements( int numIndexes, const glIndex_t *indexes ) { } if ( primitives == 1 ) { - R_DrawStripElements( numIndexes, indexes, qglArrayElement ); + R_DrawStripElements( numIndexes, indexes, glArrayElement ); return; } @@ -253,28 +253,28 @@ Draws triangle outlines for debugging */ static void DrawTris (shaderCommands_t *input) { GL_Bind( tr.whiteImage ); - qglColor3f (1,1,1); + glColor3f (1,1,1); GL_State( GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE ); - qglDepthRange( 0, 0 ); + glDepthRange( 0, 0 ); - qglDisableClientState (GL_COLOR_ARRAY); - qglDisableClientState (GL_TEXTURE_COORD_ARRAY); + glDisableClientState (GL_COLOR_ARRAY); + glDisableClientState (GL_TEXTURE_COORD_ARRAY); - qglVertexPointer (3, GL_FLOAT, 16, input->xyz); // padded for SIMD + glVertexPointer (3, GL_FLOAT, 16, input->xyz); // padded for SIMD - if (qglLockArraysEXT) { - qglLockArraysEXT(0, input->numVertexes); + if (GLEW_EXT_compiled_vertex_array) { + glLockArraysEXT(0, input->numVertexes); GLimp_LogComment( "glLockArraysEXT\n" ); } R_DrawElements( input->numIndexes, input->indexes ); - if (qglUnlockArraysEXT) { - qglUnlockArraysEXT(); + if (GLEW_EXT_compiled_vertex_array) { + glUnlockArraysEXT(); GLimp_LogComment( "glUnlockArraysEXT\n" ); } - qglDepthRange( 0, 1 ); + glDepthRange( 0, 1 ); } @@ -290,19 +290,19 @@ static void DrawNormals (shaderCommands_t *input) { vec3_t temp; GL_Bind( tr.whiteImage ); - qglColor3f (1,1,1); - qglDepthRange( 0, 0 ); // never occluded + glColor3f (1,1,1); + glDepthRange( 0, 0 ); // never occluded GL_State( GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE ); - qglBegin (GL_LINES); + glBegin (GL_LINES); for (i = 0 ; i < input->numVertexes ; i++) { - qglVertex3fv (input->xyz[i]); + glVertex3fv (input->xyz[i]); VectorMA (input->xyz[i], 2, input->normal[i], temp); - qglVertex3fv (temp); + glVertex3fv (temp); } - qglEnd (); + glEnd (); - qglDepthRange( 0, 1 ); + glDepthRange( 0, 1 ); } /* @@ -355,22 +355,22 @@ static void DrawMultitextured( shaderCommands_t *input, int stage ) { // this is an ugly hack to work around a GeForce driver // bug with multitexture and clip planes if ( backEnd.viewParms.isPortal ) { - qglPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); + glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); } // // base // GL_SelectTexture( 0 ); - qglTexCoordPointer( 2, GL_FLOAT, 0, input->svars.texcoords[0] ); + glTexCoordPointer( 2, GL_FLOAT, 0, input->svars.texcoords[0] ); R_BindAnimatedImage( &pStage->bundle[0] ); // // lightmap/secondary pass // GL_SelectTexture( 1 ); - qglEnable( GL_TEXTURE_2D ); - qglEnableClientState( GL_TEXTURE_COORD_ARRAY ); + glEnable( GL_TEXTURE_2D ); + glEnableClientState( GL_TEXTURE_COORD_ARRAY ); if ( r_lightmap->integer ) { GL_TexEnv( GL_REPLACE ); @@ -378,7 +378,7 @@ static void DrawMultitextured( shaderCommands_t *input, int stage ) { GL_TexEnv( tess.shader->multitextureEnv ); } - qglTexCoordPointer( 2, GL_FLOAT, 0, input->svars.texcoords[1] ); + glTexCoordPointer( 2, GL_FLOAT, 0, input->svars.texcoords[1] ); R_BindAnimatedImage( &pStage->bundle[1] ); @@ -387,8 +387,8 @@ static void DrawMultitextured( shaderCommands_t *input, int stage ) { // // disable texturing on TEXTURE1, then select TEXTURE0 // - //qglDisableClientState( GL_TEXTURE_COORD_ARRAY ); - qglDisable( GL_TEXTURE_2D ); + //glDisableClientState( GL_TEXTURE_COORD_ARRAY ); + glDisable( GL_TEXTURE_2D ); GL_SelectTexture( 0 ); } @@ -562,11 +562,11 @@ static void ProjectDlightTexture_altivec( void ) { continue; } - qglEnableClientState( GL_TEXTURE_COORD_ARRAY ); - qglTexCoordPointer( 2, GL_FLOAT, 0, texCoordsArray[0] ); + glEnableClientState( GL_TEXTURE_COORD_ARRAY ); + glTexCoordPointer( 2, GL_FLOAT, 0, texCoordsArray[0] ); - qglEnableClientState( GL_COLOR_ARRAY ); - qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, colorArray ); + glEnableClientState( GL_COLOR_ARRAY ); + glColorPointer( 4, GL_UNSIGNED_BYTE, 0, colorArray ); GL_Bind( tr.dlightImage ); // include GLS_DEPTHFUNC_EQUAL so alpha tested surfaces don't add light @@ -716,11 +716,11 @@ static void ProjectDlightTexture_scalar( void ) { continue; } - qglEnableClientState( GL_TEXTURE_COORD_ARRAY ); - qglTexCoordPointer( 2, GL_FLOAT, 0, texCoordsArray[0] ); + glEnableClientState( GL_TEXTURE_COORD_ARRAY ); + glTexCoordPointer( 2, GL_FLOAT, 0, texCoordsArray[0] ); - qglEnableClientState( GL_COLOR_ARRAY ); - qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, colorArray ); + glEnableClientState( GL_COLOR_ARRAY ); + glColorPointer( 4, GL_UNSIGNED_BYTE, 0, colorArray ); GL_Bind( tr.dlightImage ); // include GLS_DEPTHFUNC_EQUAL so alpha tested surfaces don't add light @@ -760,11 +760,11 @@ static void RB_FogPass( void ) { fog_t *fog; int i; - qglEnableClientState( GL_COLOR_ARRAY ); - qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, tess.svars.colors ); + glEnableClientState( GL_COLOR_ARRAY ); + glColorPointer( 4, GL_UNSIGNED_BYTE, 0, tess.svars.colors ); - qglEnableClientState( GL_TEXTURE_COORD_ARRAY); - qglTexCoordPointer( 2, GL_FLOAT, 0, tess.svars.texcoords[0] ); + glEnableClientState( GL_TEXTURE_COORD_ARRAY); + glTexCoordPointer( 2, GL_FLOAT, 0, tess.svars.texcoords[0] ); fog = tr.world->fogs + tess.fogNum; @@ -1124,8 +1124,8 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input ) if ( !setArraysOnce ) { - qglEnableClientState( GL_COLOR_ARRAY ); - qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, input->svars.colors ); + glEnableClientState( GL_COLOR_ARRAY ); + glColorPointer( 4, GL_UNSIGNED_BYTE, 0, input->svars.colors ); } // @@ -1139,7 +1139,7 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input ) { if ( !setArraysOnce ) { - qglTexCoordPointer( 2, GL_FLOAT, 0, input->svars.texcoords[0] ); + glTexCoordPointer( 2, GL_FLOAT, 0, input->svars.texcoords[0] ); } // @@ -1199,8 +1199,8 @@ void RB_StageIteratorGeneric( void ) // set polygon offset if necessary if ( shader->polygonOffset ) { - qglEnable( GL_POLYGON_OFFSET_FILL ); - qglPolygonOffset( r_offsetFactor->value, r_offsetUnits->value ); + glEnable( GL_POLYGON_OFFSET_FILL ); + glPolygonOffset( r_offsetFactor->value, r_offsetUnits->value ); } // @@ -1212,27 +1212,27 @@ void RB_StageIteratorGeneric( void ) if ( tess.numPasses > 1 || shader->multitextureEnv ) { setArraysOnce = qfalse; - qglDisableClientState (GL_COLOR_ARRAY); - qglDisableClientState (GL_TEXTURE_COORD_ARRAY); + glDisableClientState (GL_COLOR_ARRAY); + glDisableClientState (GL_TEXTURE_COORD_ARRAY); } else { setArraysOnce = qtrue; - qglEnableClientState( GL_COLOR_ARRAY); - qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, tess.svars.colors ); + glEnableClientState( GL_COLOR_ARRAY); + glColorPointer( 4, GL_UNSIGNED_BYTE, 0, tess.svars.colors ); - qglEnableClientState( GL_TEXTURE_COORD_ARRAY); - qglTexCoordPointer( 2, GL_FLOAT, 0, tess.svars.texcoords[0] ); + glEnableClientState( GL_TEXTURE_COORD_ARRAY); + glTexCoordPointer( 2, GL_FLOAT, 0, tess.svars.texcoords[0] ); } // // lock XYZ // - qglVertexPointer (3, GL_FLOAT, 16, input->xyz); // padded for SIMD - if (qglLockArraysEXT) + glVertexPointer (3, GL_FLOAT, 16, input->xyz); // padded for SIMD + if (GLEW_EXT_compiled_vertex_array) { - qglLockArraysEXT(0, input->numVertexes); + glLockArraysEXT(0, input->numVertexes); GLimp_LogComment( "glLockArraysEXT\n" ); } @@ -1241,8 +1241,8 @@ void RB_StageIteratorGeneric( void ) // if ( !setArraysOnce ) { - qglEnableClientState( GL_TEXTURE_COORD_ARRAY ); - qglEnableClientState( GL_COLOR_ARRAY ); + glEnableClientState( GL_TEXTURE_COORD_ARRAY ); + glEnableClientState( GL_COLOR_ARRAY ); } // @@ -1268,9 +1268,9 @@ void RB_StageIteratorGeneric( void ) // // unlock arrays // - if (qglUnlockArraysEXT) + if (GLEW_EXT_compiled_vertex_array) { - qglUnlockArraysEXT(); + glUnlockArraysEXT(); GLimp_LogComment( "glUnlockArraysEXT\n" ); } @@ -1279,7 +1279,7 @@ void RB_StageIteratorGeneric( void ) // if ( shader->polygonOffset ) { - qglDisable( GL_POLYGON_OFFSET_FILL ); + glDisable( GL_POLYGON_OFFSET_FILL ); } } @@ -1318,16 +1318,16 @@ void RB_StageIteratorVertexLitTexture( void ) // // set arrays and lock // - qglEnableClientState( GL_COLOR_ARRAY); - qglEnableClientState( GL_TEXTURE_COORD_ARRAY); + glEnableClientState( GL_COLOR_ARRAY); + glEnableClientState( GL_TEXTURE_COORD_ARRAY); - qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, tess.svars.colors ); - qglTexCoordPointer( 2, GL_FLOAT, 16, tess.texCoords[0][0] ); - qglVertexPointer (3, GL_FLOAT, 16, input->xyz); + glColorPointer( 4, GL_UNSIGNED_BYTE, 0, tess.svars.colors ); + glTexCoordPointer( 2, GL_FLOAT, 16, tess.texCoords[0][0] ); + glVertexPointer (3, GL_FLOAT, 16, input->xyz); - if ( qglLockArraysEXT ) + if ( GLEW_EXT_compiled_vertex_array ) { - qglLockArraysEXT(0, input->numVertexes); + glLockArraysEXT(0, input->numVertexes); GLimp_LogComment( "glLockArraysEXT\n" ); } @@ -1355,9 +1355,9 @@ void RB_StageIteratorVertexLitTexture( void ) // // unlock arrays // - if (qglUnlockArraysEXT) + if (GLEW_EXT_compiled_vertex_array) { - qglUnlockArraysEXT(); + glUnlockArraysEXT(); GLimp_LogComment( "glUnlockArraysEXT\n" ); } } @@ -1389,15 +1389,15 @@ void RB_StageIteratorLightmappedMultitexture( void ) { // set color, pointers, and lock // GL_State( GLS_DEFAULT ); - qglVertexPointer( 3, GL_FLOAT, 16, input->xyz ); + glVertexPointer( 3, GL_FLOAT, 16, input->xyz ); #ifdef REPLACE_MODE - qglDisableClientState( GL_COLOR_ARRAY ); - qglColor3f( 1, 1, 1 ); - qglShadeModel( GL_FLAT ); + glDisableClientState( GL_COLOR_ARRAY ); + glColor3f( 1, 1, 1 ); + glShadeModel( GL_FLAT ); #else - qglEnableClientState( GL_COLOR_ARRAY ); - qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, tess.constantColor255 ); + glEnableClientState( GL_COLOR_ARRAY ); + glColorPointer( 4, GL_UNSIGNED_BYTE, 0, tess.constantColor255 ); #endif // @@ -1405,29 +1405,29 @@ void RB_StageIteratorLightmappedMultitexture( void ) { // GL_SelectTexture( 0 ); - qglEnableClientState( GL_TEXTURE_COORD_ARRAY ); + glEnableClientState( GL_TEXTURE_COORD_ARRAY ); R_BindAnimatedImage( &tess.xstages[0]->bundle[0] ); - qglTexCoordPointer( 2, GL_FLOAT, 16, tess.texCoords[0][0] ); + glTexCoordPointer( 2, GL_FLOAT, 16, tess.texCoords[0][0] ); // // configure second stage // GL_SelectTexture( 1 ); - qglEnable( GL_TEXTURE_2D ); + glEnable( GL_TEXTURE_2D ); if ( r_lightmap->integer ) { GL_TexEnv( GL_REPLACE ); } else { GL_TexEnv( GL_MODULATE ); } R_BindAnimatedImage( &tess.xstages[0]->bundle[1] ); - qglEnableClientState( GL_TEXTURE_COORD_ARRAY ); - qglTexCoordPointer( 2, GL_FLOAT, 16, tess.texCoords[0][1] ); + glEnableClientState( GL_TEXTURE_COORD_ARRAY ); + glTexCoordPointer( 2, GL_FLOAT, 16, tess.texCoords[0][1] ); // // lock arrays // - if ( qglLockArraysEXT ) { - qglLockArraysEXT(0, input->numVertexes); + if ( GLEW_EXT_compiled_vertex_array ) { + glLockArraysEXT(0, input->numVertexes); GLimp_LogComment( "glLockArraysEXT\n" ); } @@ -1436,13 +1436,13 @@ void RB_StageIteratorLightmappedMultitexture( void ) { // // disable texturing on TEXTURE1, then select TEXTURE0 // - qglDisable( GL_TEXTURE_2D ); - qglDisableClientState( GL_TEXTURE_COORD_ARRAY ); + glDisable( GL_TEXTURE_2D ); + glDisableClientState( GL_TEXTURE_COORD_ARRAY ); GL_SelectTexture( 0 ); #ifdef REPLACE_MODE GL_TexEnv( GL_MODULATE ); - qglShadeModel( GL_SMOOTH ); + glShadeModel( GL_SMOOTH ); #endif // @@ -1462,8 +1462,8 @@ void RB_StageIteratorLightmappedMultitexture( void ) { // // unlock arrays // - if ( qglUnlockArraysEXT ) { - qglUnlockArraysEXT(); + if ( GLEW_EXT_compiled_vertex_array ) { + glUnlockArraysEXT(); GLimp_LogComment( "glUnlockArraysEXT\n" ); } } diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c index 9bb6416..307a1e0 100644 --- a/code/renderer/tr_shader.c +++ b/code/renderer/tr_shader.c @@ -1756,7 +1756,7 @@ static qboolean CollapseMultitexture( void ) { int i; textureBundle_t tmpBundle; - if ( !qglActiveTextureARB ) { + if ( !GLEW_ARB_multitexture ) { return qfalse; } diff --git a/code/renderer/tr_shadows.c b/code/renderer/tr_shadows.c index f412b00..dff8107 100644 --- a/code/renderer/tr_shadows.c +++ b/code/renderer/tr_shadows.c @@ -78,16 +78,16 @@ void R_RenderShadowEdges( void ) { i2 = tess.indexes[ i*3 + 1 ]; i3 = tess.indexes[ i*3 + 2 ]; - qglBegin( GL_TRIANGLE_STRIP ); - qglVertex3fv( tess.xyz[ i1 ] ); - qglVertex3fv( tess.xyz[ i1 + tess.numVertexes ] ); - qglVertex3fv( tess.xyz[ i2 ] ); - qglVertex3fv( tess.xyz[ i2 + tess.numVertexes ] ); - qglVertex3fv( tess.xyz[ i3 ] ); - qglVertex3fv( tess.xyz[ i3 + tess.numVertexes ] ); - qglVertex3fv( tess.xyz[ i1 ] ); - qglVertex3fv( tess.xyz[ i1 + tess.numVertexes ] ); - qglEnd(); + glBegin( GL_TRIANGLE_STRIP ); + glVertex3fv( tess.xyz[ i1 ] ); + glVertex3fv( tess.xyz[ i1 + tess.numVertexes ] ); + glVertex3fv( tess.xyz[ i2 ] ); + glVertex3fv( tess.xyz[ i2 + tess.numVertexes ] ); + glVertex3fv( tess.xyz[ i3 ] ); + glVertex3fv( tess.xyz[ i3 + tess.numVertexes ] ); + glVertex3fv( tess.xyz[ i1 ] ); + glVertex3fv( tess.xyz[ i1 + tess.numVertexes ] ); + glEnd(); } #else int c, c2; @@ -124,12 +124,12 @@ void R_RenderShadowEdges( void ) { // if it doesn't share the edge with another front facing // triangle, it is a sil edge if ( hit[ 1 ] == 0 ) { - qglBegin( GL_TRIANGLE_STRIP ); - qglVertex3fv( tess.xyz[ i ] ); - qglVertex3fv( tess.xyz[ i + tess.numVertexes ] ); - qglVertex3fv( tess.xyz[ i2 ] ); - qglVertex3fv( tess.xyz[ i2 + tess.numVertexes ] ); - qglEnd(); + glBegin( GL_TRIANGLE_STRIP ); + glVertex3fv( tess.xyz[ i ] ); + glVertex3fv( tess.xyz[ i + tess.numVertexes ] ); + glVertex3fv( tess.xyz[ i2 ] ); + glVertex3fv( tess.xyz[ i2 + tess.numVertexes ] ); + glEnd(); c_edges++; } else { c_rejected++; @@ -211,43 +211,43 @@ void RB_ShadowTessEnd( void ) { // draw the silhouette edges GL_Bind( tr.whiteImage ); - qglEnable( GL_CULL_FACE ); + glEnable( GL_CULL_FACE ); GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ZERO ); - qglColor3f( 0.2f, 0.2f, 0.2f ); + glColor3f( 0.2f, 0.2f, 0.2f ); // don't write to the color buffer - qglGetBooleanv(GL_COLOR_WRITEMASK, rgba); - qglColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE ); + glGetBooleanv(GL_COLOR_WRITEMASK, rgba); + glColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE ); - qglEnable( GL_STENCIL_TEST ); - qglStencilFunc( GL_ALWAYS, 1, 255 ); + glEnable( GL_STENCIL_TEST ); + glStencilFunc( GL_ALWAYS, 1, 255 ); // mirrors have the culling order reversed if ( backEnd.viewParms.isMirror ) { - qglCullFace( GL_FRONT ); - qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR ); + glCullFace( GL_FRONT ); + glStencilOp( GL_KEEP, GL_KEEP, GL_INCR ); R_RenderShadowEdges(); - qglCullFace( GL_BACK ); - qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR ); + glCullFace( GL_BACK ); + glStencilOp( GL_KEEP, GL_KEEP, GL_DECR ); R_RenderShadowEdges(); } else { - qglCullFace( GL_BACK ); - qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR ); + glCullFace( GL_BACK ); + glStencilOp( GL_KEEP, GL_KEEP, GL_INCR ); R_RenderShadowEdges(); - qglCullFace( GL_FRONT ); - qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR ); + glCullFace( GL_FRONT ); + glStencilOp( GL_KEEP, GL_KEEP, GL_DECR ); R_RenderShadowEdges(); } // reenable writing to the color buffer - qglColorMask(rgba[0], rgba[1], rgba[2], rgba[3]); + glColorMask(rgba[0], rgba[1], rgba[2], rgba[3]); } @@ -268,31 +268,31 @@ void RB_ShadowFinish( void ) { if ( glConfig.stencilBits < 4 ) { return; } - qglEnable( GL_STENCIL_TEST ); - qglStencilFunc( GL_NOTEQUAL, 0, 255 ); + glEnable( GL_STENCIL_TEST ); + glStencilFunc( GL_NOTEQUAL, 0, 255 ); - qglDisable (GL_CLIP_PLANE0); - qglDisable (GL_CULL_FACE); + glDisable (GL_CLIP_PLANE0); + glDisable (GL_CULL_FACE); GL_Bind( tr.whiteImage ); - qglLoadIdentity (); + glLoadIdentity (); - qglColor3f( 0.6f, 0.6f, 0.6f ); + glColor3f( 0.6f, 0.6f, 0.6f ); GL_State( GLS_DEPTHMASK_TRUE | GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO ); -// qglColor3f( 1, 0, 0 ); +// glColor3f( 1, 0, 0 ); // GL_State( GLS_DEPTHMASK_TRUE | GLS_SRCBLEND_ONE | GLS_DSTBLEND_ZERO ); - qglBegin( GL_QUADS ); - qglVertex3f( -100, 100, -10 ); - qglVertex3f( 100, 100, -10 ); - qglVertex3f( 100, -100, -10 ); - qglVertex3f( -100, -100, -10 ); - qglEnd (); + glBegin( GL_QUADS ); + glVertex3f( -100, 100, -10 ); + glVertex3f( 100, 100, -10 ); + glVertex3f( 100, -100, -10 ); + glVertex3f( -100, -100, -10 ); + glEnd (); - qglColor4f(1,1,1,1); - qglDisable( GL_STENCIL_TEST ); + glColor4f(1,1,1,1); + glDisable( GL_STENCIL_TEST ); } diff --git a/code/renderer/tr_sky.c b/code/renderer/tr_sky.c index 3e774a3..4709856 100644 --- a/code/renderer/tr_sky.c +++ b/code/renderer/tr_sky.c @@ -369,18 +369,18 @@ static void DrawSkySide( struct image_s *image, const int mins[2], const int max for ( t = mins[1]+HALF_SKY_SUBDIVISIONS; t < maxs[1]+HALF_SKY_SUBDIVISIONS; t++ ) { - qglBegin( GL_TRIANGLE_STRIP ); + glBegin( GL_TRIANGLE_STRIP ); for ( s = mins[0]+HALF_SKY_SUBDIVISIONS; s <= maxs[0]+HALF_SKY_SUBDIVISIONS; s++ ) { - qglTexCoord2fv( s_skyTexCoords[t][s] ); - qglVertex3fv( s_skyPoints[t][s] ); + glTexCoord2fv( s_skyTexCoords[t][s] ); + glVertex3fv( s_skyPoints[t][s] ); - qglTexCoord2fv( s_skyTexCoords[t+1][s] ); - qglVertex3fv( s_skyPoints[t+1][s] ); + glTexCoord2fv( s_skyTexCoords[t+1][s] ); + glVertex3fv( s_skyPoints[t+1][s] ); } - qglEnd(); + glEnd(); } } @@ -708,8 +708,8 @@ void RB_DrawSun( void ) { if ( !r_drawSun->integer ) { return; } - qglLoadMatrixf( backEnd.viewParms.world.modelMatrix ); - qglTranslatef (backEnd.viewParms.or.origin[0], backEnd.viewParms.or.origin[1], backEnd.viewParms.or.origin[2]); + glLoadMatrixf( backEnd.viewParms.world.modelMatrix ); + glTranslatef (backEnd.viewParms.or.origin[0], backEnd.viewParms.or.origin[1], backEnd.viewParms.or.origin[2]); dist = backEnd.viewParms.zFar / 1.75; // div sqrt(3) size = dist * 0.4; @@ -722,7 +722,7 @@ void RB_DrawSun( void ) { VectorScale( vec2, size, vec2 ); // farthest depth range - qglDepthRange( 1.0, 1.0 ); + glDepthRange( 1.0, 1.0 ); // FIXME: use quad stamp RB_BeginSurface( tr.sunShader, tess.fogNum ); @@ -780,7 +780,7 @@ void RB_DrawSun( void ) { RB_EndSurface(); // back to normal depth range - qglDepthRange( 0.0, 1.0 ); + glDepthRange( 0.0, 1.0 ); } @@ -809,22 +809,22 @@ void RB_StageIteratorSky( void ) { // front of everything to allow developers to see how // much sky is getting sucked in if ( r_showsky->integer ) { - qglDepthRange( 0.0, 0.0 ); + glDepthRange( 0.0, 0.0 ); } else { - qglDepthRange( 1.0, 1.0 ); + glDepthRange( 1.0, 1.0 ); } // draw the outer skybox if ( tess.shader->sky.outerbox[0] && tess.shader->sky.outerbox[0] != tr.defaultImage ) { - qglColor3f( tr.identityLight, tr.identityLight, tr.identityLight ); + glColor3f( tr.identityLight, tr.identityLight, tr.identityLight ); - qglPushMatrix (); + glPushMatrix (); GL_State( 0 ); - qglTranslatef (backEnd.viewParms.or.origin[0], backEnd.viewParms.or.origin[1], backEnd.viewParms.or.origin[2]); + glTranslatef (backEnd.viewParms.or.origin[0], backEnd.viewParms.or.origin[1], backEnd.viewParms.or.origin[2]); DrawSkyBox( tess.shader ); - qglPopMatrix(); + glPopMatrix(); } // generate the vertexes for all the clouds, which will be drawn @@ -837,7 +837,7 @@ void RB_StageIteratorSky( void ) { // back to normal depth range - qglDepthRange( 0.0, 1.0 ); + glDepthRange( 0.0, 1.0 ); // note that sky was drawn so we will draw a sun later backEnd.skyRenderedThisView = qtrue; diff --git a/code/renderer/tr_surface.c b/code/renderer/tr_surface.c index 7559215..cf69f7b 100644 --- a/code/renderer/tr_surface.c +++ b/code/renderer/tr_surface.c @@ -326,14 +326,14 @@ static void RB_SurfaceBeam( void ) GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE ); - qglColor3f( 1, 0, 0 ); + glColor3f( 1, 0, 0 ); - qglBegin( GL_TRIANGLE_STRIP ); + glBegin( GL_TRIANGLE_STRIP ); for ( i = 0; i <= NUM_BEAM_SEGS; i++ ) { - qglVertex3fv( start_points[ i % NUM_BEAM_SEGS] ); - qglVertex3fv( end_points[ i % NUM_BEAM_SEGS] ); + glVertex3fv( start_points[ i % NUM_BEAM_SEGS] ); + glVertex3fv( end_points[ i % NUM_BEAM_SEGS] ); } - qglEnd(); + glEnd(); } //================================================================================ @@ -1157,19 +1157,19 @@ Draws x/y/z lines from the origin for orientation debugging */ static void RB_SurfaceAxis( void ) { GL_Bind( tr.whiteImage ); - qglLineWidth( 3 ); - qglBegin( GL_LINES ); - qglColor3f( 1,0,0 ); - qglVertex3f( 0,0,0 ); - qglVertex3f( 16,0,0 ); - qglColor3f( 0,1,0 ); - qglVertex3f( 0,0,0 ); - qglVertex3f( 0,16,0 ); - qglColor3f( 0,0,1 ); - qglVertex3f( 0,0,0 ); - qglVertex3f( 0,0,16 ); - qglEnd(); - qglLineWidth( 1 ); + glLineWidth( 3 ); + glBegin( GL_LINES ); + glColor3f( 1,0,0 ); + glVertex3f( 0,0,0 ); + glVertex3f( 16,0,0 ); + glColor3f( 0,1,0 ); + glVertex3f( 0,0,0 ); + glVertex3f( 0,16,0 ); + glColor3f( 0,0,1 ); + glVertex3f( 0,0,0 ); + glVertex3f( 0,0,16 ); + glEnd(); + glLineWidth( 1 ); } //=========================================================================== @@ -1218,7 +1218,7 @@ static void RB_SurfaceFlare(srfFlare_t *surf) static void RB_SurfaceDisplayList( srfDisplayList_t *surf ) { // all apropriate state must be set in RB_BeginSurface // this isn't implemented yet... - qglCallList( surf->listNum ); + glCallList( surf->listNum ); } static void RB_SurfaceSkip( void *surf ) { diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c index cbdbcef..273a600 100644 --- a/code/sdl/sdl_glimp.c +++ b/code/sdl/sdl_glimp.c @@ -76,13 +76,6 @@ cvar_t *r_allowResize; // make window resizable cvar_t *r_centerWindow; cvar_t *r_sdlDriver; -void (APIENTRYP qglActiveTextureARB) (GLenum texture); -void (APIENTRYP qglClientActiveTextureARB) (GLenum texture); -void (APIENTRYP qglMultiTexCoord2fARB) (GLenum target, GLfloat s, GLfloat t); - -void (APIENTRYP qglLockArraysEXT) (GLint first, GLsizei count); -void (APIENTRYP qglUnlockArraysEXT) (void); - /* =============== GLimp_Shutdown @@ -436,7 +429,7 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder) screen = vidscreen; - glstring = (char *) qglGetString (GL_RENDERER); + glstring = (char *) glGetString (GL_RENDERER); ri.Printf( PRINT_ALL, "GL_RENDERER: %s\n", glstring ); return RSERR_OK; @@ -492,15 +485,6 @@ static qboolean GLimp_StartDriverAndSetMode(int mode, qboolean fullscreen, qbool return qtrue; } -static qboolean GLimp_HaveExtension(const char *ext) -{ - const char *ptr = Q_stristr( glConfig.extensions_string, ext ); - if (ptr == NULL) - return qfalse; - ptr += strlen(ext); - return ((*ptr == ' ') || (*ptr == '\0')); // verify it's complete string. -} - /* =============== @@ -509,6 +493,8 @@ GLimp_InitExtensions */ static void GLimp_InitExtensions( void ) { + glewInit( ); + if ( !r_allowExtensions->integer ) { ri.Printf( PRINT_ALL, "* IGNORING OPENGL EXTENSIONS *\n" ); @@ -520,8 +506,8 @@ static void GLimp_InitExtensions( void ) glConfig.textureCompression = TC_NONE; // GL_EXT_texture_compression_s3tc - if ( GLimp_HaveExtension( "GL_ARB_texture_compression" ) && - GLimp_HaveExtension( "GL_EXT_texture_compression_s3tc" ) ) + if ( GLEW_ARB_texture_compression && + GLEW_EXT_texture_compression_s3tc ) { if ( r_ext_compressed_textures->value ) { @@ -541,7 +527,7 @@ static void GLimp_InitExtensions( void ) // GL_S3_s3tc ... legacy extension before GL_EXT_texture_compression_s3tc. if (glConfig.textureCompression == TC_NONE) { - if ( GLimp_HaveExtension( "GL_S3_s3tc" ) ) + if ( GLEW_S3_s3tc ) { if ( r_ext_compressed_textures->value ) { @@ -562,7 +548,7 @@ static void GLimp_InitExtensions( void ) // GL_EXT_texture_env_add glConfig.textureEnvAddAvailable = qfalse; - if ( GLimp_HaveExtension( "EXT_texture_env_add" ) ) + if ( GLEW_EXT_texture_env_add ) { if ( r_ext_texture_env_add->integer ) { @@ -581,73 +567,38 @@ static void GLimp_InitExtensions( void ) } // GL_ARB_multitexture - qglMultiTexCoord2fARB = NULL; - qglActiveTextureARB = NULL; - qglClientActiveTextureARB = NULL; - if ( GLimp_HaveExtension( "GL_ARB_multitexture" ) ) + glConfig.numTextureUnits = 1; + if ( GLEW_ARB_multitexture ) { if ( r_ext_multitexture->value ) { - qglMultiTexCoord2fARB = SDL_GL_GetProcAddress( "glMultiTexCoord2fARB" ); - qglActiveTextureARB = SDL_GL_GetProcAddress( "glActiveTextureARB" ); - qglClientActiveTextureARB = SDL_GL_GetProcAddress( "glClientActiveTextureARB" ); - - if ( qglActiveTextureARB ) + GLint glint = 0; + glGetIntegerv( GL_MAX_TEXTURE_UNITS_ARB, &glint ); + glConfig.numTextureUnits = (int) glint; + if ( glConfig.numTextureUnits > 1 ) { - GLint glint = 0; - qglGetIntegerv( GL_MAX_TEXTURE_UNITS_ARB, &glint ); - glConfig.numTextureUnits = (int) glint; - if ( glConfig.numTextureUnits > 1 ) - { - ri.Printf( PRINT_ALL, "...using GL_ARB_multitexture\n" ); - } - else - { - qglMultiTexCoord2fARB = NULL; - qglActiveTextureARB = NULL; - qglClientActiveTextureARB = NULL; - ri.Printf( PRINT_ALL, "...not using GL_ARB_multitexture, < 2 texture units\n" ); - } + ri.Printf( PRINT_ALL, "...using GL_ARB_multitexture\n" ); } - } - else - { - ri.Printf( PRINT_ALL, "...ignoring GL_ARB_multitexture\n" ); - } - } - else - { - ri.Printf( PRINT_ALL, "...GL_ARB_multitexture not found\n" ); - } - - // GL_EXT_compiled_vertex_array - if ( GLimp_HaveExtension( "GL_EXT_compiled_vertex_array" ) ) - { - if ( r_ext_compiled_vertex_array->value ) - { - ri.Printf( PRINT_ALL, "...using GL_EXT_compiled_vertex_array\n" ); - qglLockArraysEXT = ( void ( APIENTRY * )( GLint, GLint ) ) SDL_GL_GetProcAddress( "glLockArraysEXT" ); - qglUnlockArraysEXT = ( void ( APIENTRY * )( void ) ) SDL_GL_GetProcAddress( "glUnlockArraysEXT" ); - if (!qglLockArraysEXT || !qglUnlockArraysEXT) + else { - ri.Error (ERR_FATAL, "bad getprocaddress"); + ri.Printf( PRINT_ALL, "...not using GL_ARB_multitexture, < 2 texture units\n" ); } } else { - ri.Printf( PRINT_ALL, "...ignoring GL_EXT_compiled_vertex_array\n" ); + ri.Printf( PRINT_ALL, "...ignoring GL_ARB_multitexture\n" ); } } else { - ri.Printf( PRINT_ALL, "...GL_EXT_compiled_vertex_array not found\n" ); + ri.Printf( PRINT_ALL, "...GL_ARB_multitexture not found\n" ); } textureFilterAnisotropic = qfalse; - if ( GLimp_HaveExtension( "GL_EXT_texture_filter_anisotropic" ) ) + if ( GLEW_EXT_texture_filter_anisotropic ) { if ( r_ext_texture_filter_anisotropic->integer ) { - qglGetIntegerv( GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, (GLint *)&maxAnisotropy ); + glGetIntegerv( GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, (GLint *)&maxAnisotropy ); if ( maxAnisotropy <= 0 ) { ri.Printf( PRINT_ALL, "...GL_EXT_texture_filter_anisotropic not properly supported!\n" ); maxAnisotropy = 0; @@ -734,12 +685,12 @@ success: glConfig.deviceSupportsGamma = SDL_SetGamma( 1.0f, 1.0f, 1.0f ) >= 0; // get our config strings - Q_strncpyz( glConfig.vendor_string, (char *) qglGetString (GL_VENDOR), sizeof( glConfig.vendor_string ) ); - Q_strncpyz( glConfig.renderer_string, (char *) qglGetString (GL_RENDERER), sizeof( glConfig.renderer_string ) ); + Q_strncpyz( glConfig.vendor_string, (char *) glGetString (GL_VENDOR), sizeof( glConfig.vendor_string ) ); + Q_strncpyz( glConfig.renderer_string, (char *) glGetString (GL_RENDERER), sizeof( glConfig.renderer_string ) ); if (*glConfig.renderer_string && glConfig.renderer_string[strlen(glConfig.renderer_string) - 1] == '\n') glConfig.renderer_string[strlen(glConfig.renderer_string) - 1] = 0; - Q_strncpyz( glConfig.version_string, (char *) qglGetString (GL_VERSION), sizeof( glConfig.version_string ) ); - Q_strncpyz( glConfig.extensions_string, (char *) qglGetString (GL_EXTENSIONS), sizeof( glConfig.extensions_string ) ); + Q_strncpyz( glConfig.version_string, (char *) glGetString (GL_VERSION), sizeof( glConfig.version_string ) ); + Q_strncpyz( glConfig.extensions_string, (char *) glGetString (GL_EXTENSIONS), sizeof( glConfig.extensions_string ) ); // initialize extensions GLimp_InitExtensions( );