quick/Quake-III-Arena-VS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up.

Browse Source
This commit is contained in:
Artem Kharytoniuk 2017-05-02 10:52:05 +03:00
parent 1d78b91051
commit 2f75ace0c9
5 changed files with 2 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/engine/platform/win_qgl.c
View File

@ -46,11 +46,8 @@ void ( APIENTRY * qglBindTexture )(GLenum target, GLuint texture);
void ( APIENTRY * qglBlendFunc )(GLenum sfactor, GLenum dfactor); void ( APIENTRY * qglBlendFunc )(GLenum sfactor, GLenum dfactor);
void ( APIENTRY * qglClear )(GLbitfield mask); void ( APIENTRY * qglClear )(GLbitfield mask);
void ( APIENTRY * qglClearColor )(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); void ( APIENTRY * qglClearColor )(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
void ( APIENTRY * qglClearDepth )(GLclampd depth);
void ( APIENTRY * qglClearStencil )(GLint s);
void ( APIENTRY * qglClipPlane )(GLenum plane, const GLdouble *equation); void ( APIENTRY * qglClipPlane )(GLenum plane, const GLdouble *equation);
void ( APIENTRY * qglColor3f )(GLfloat red, GLfloat green, GLfloat blue); void ( APIENTRY * qglColor3f )(GLfloat red, GLfloat green, GLfloat blue);
void ( APIENTRY * qglColor4f )(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
void ( APIENTRY * qglColorMask )(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); void ( APIENTRY * qglColorMask )(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
void ( APIENTRY * qglColorPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); void ( APIENTRY * qglColorPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
void ( APIENTRY * qglCullFace )(GLenum mode); void ( APIENTRY * qglCullFace )(GLenum mode);
@ -80,9 +77,7 @@ void ( APIENTRY * qglPopMatrix )(void);
void ( APIENTRY * qglPushMatrix )(void); void ( APIENTRY * qglPushMatrix )(void);
void ( APIENTRY * qglReadPixels )(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); void ( APIENTRY * qglReadPixels )(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
void ( APIENTRY * qglScissor )(GLint x, GLint y, GLsizei width, GLsizei height); void ( APIENTRY * qglScissor )(GLint x, GLint y, GLsizei width, GLsizei height);
void ( APIENTRY * qglShadeModel )(GLenum mode);
void ( APIENTRY * qglStencilFunc )(GLenum func, GLint ref, GLuint mask); void ( APIENTRY * qglStencilFunc )(GLenum func, GLint ref, GLuint mask);
void ( APIENTRY * qglStencilMask )(GLuint mask);
void ( APIENTRY * qglStencilOp )(GLenum fail, GLenum zfail, GLenum zpass); void ( APIENTRY * qglStencilOp )(GLenum fail, GLenum zfail, GLenum zpass);
void ( APIENTRY * qglTexCoord2f )(GLfloat s, GLfloat t); void ( APIENTRY * qglTexCoord2f )(GLfloat s, GLfloat t);
void ( APIENTRY * qglTexCoord2fv )(const GLfloat *v); void ( APIENTRY * qglTexCoord2fv )(const GLfloat *v);
@ -105,11 +100,8 @@ static void ( APIENTRY * dllBindTexture )(GLenum target, GLuint texture);
static void ( APIENTRY * dllBlendFunc )(GLenum sfactor, GLenum dfactor); static void ( APIENTRY * dllBlendFunc )(GLenum sfactor, GLenum dfactor);
static void ( APIENTRY * dllClear )(GLbitfield mask); static void ( APIENTRY * dllClear )(GLbitfield mask);
static void ( APIENTRY * dllClearColor )(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); static void ( APIENTRY * dllClearColor )(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
static void ( APIENTRY * dllClearDepth )(GLclampd depth);
static void ( APIENTRY * dllClearStencil )(GLint s);
static void ( APIENTRY * dllClipPlane )(GLenum plane, const GLdouble *equation); static void ( APIENTRY * dllClipPlane )(GLenum plane, const GLdouble *equation);
static void ( APIENTRY * dllColor3f )(GLfloat red, GLfloat green, GLfloat blue); static void ( APIENTRY * dllColor3f )(GLfloat red, GLfloat green, GLfloat blue);
static void ( APIENTRY * dllColor4f )(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
static void ( APIENTRY * dllColorMask )(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); static void ( APIENTRY * dllColorMask )(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
static void ( APIENTRY * dllColorPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); static void ( APIENTRY * dllColorPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
static void ( APIENTRY * dllCullFace )(GLenum mode); static void ( APIENTRY * dllCullFace )(GLenum mode);
@ -139,9 +131,7 @@ static void ( APIENTRY * dllPopMatrix )(void);
static void ( APIENTRY * dllPushMatrix )(void); static void ( APIENTRY * dllPushMatrix )(void);
static void ( APIENTRY * dllReadPixels )(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); static void ( APIENTRY * dllReadPixels )(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
static void ( APIENTRY * dllScissor )(GLint x, GLint y, GLsizei width, GLsizei height); static void ( APIENTRY * dllScissor )(GLint x, GLint y, GLsizei width, GLsizei height);
static void ( APIENTRY * dllShadeModel )(GLenum mode);
static void ( APIENTRY * dllStencilFunc )(GLenum func, GLint ref, GLuint mask); static void ( APIENTRY * dllStencilFunc )(GLenum func, GLint ref, GLuint mask);
static void ( APIENTRY * dllStencilMask )(GLuint mask);
static void ( APIENTRY * dllStencilOp )(GLenum fail, GLenum zfail, GLenum zpass); static void ( APIENTRY * dllStencilOp )(GLenum fail, GLenum zfail, GLenum zpass);
static void ( APIENTRY * dllTexCoord2f )(GLfloat s, GLfloat t); static void ( APIENTRY * dllTexCoord2f )(GLfloat s, GLfloat t);
static void ( APIENTRY * dllTexCoord2fv )(const GLfloat *v); static void ( APIENTRY * dllTexCoord2fv )(const GLfloat *v);
@ -355,16 +345,6 @@ static void APIENTRY logClearColor(GLclampf red, GLclampf green, GLclampf blue,
fprintf( glw_state.log_fp, "glClearColor\n" ); fprintf( glw_state.log_fp, "glClearColor\n" );
dllClearColor( red, green, blue, alpha ); dllClearColor( red, green, blue, alpha );
} }
static void APIENTRY logClearDepth(GLclampd depth)
{
fprintf( glw_state.log_fp, "glClearDepth( %f )\n", ( float ) depth );
dllClearDepth( depth );
}
static void APIENTRY logClearStencil(GLint s)
{
fprintf( glw_state.log_fp, "glClearStencil( %d )\n", s );
dllClearStencil( s );
}
static void APIENTRY logClipPlane(GLenum plane, const GLdouble *equation) static void APIENTRY logClipPlane(GLenum plane, const GLdouble *equation)
{ {
fprintf( glw_state.log_fp, "glClipPlane\n" ); fprintf( glw_state.log_fp, "glClipPlane\n" );
@ -378,11 +358,6 @@ static void APIENTRY logColor3f(GLfloat red, GLfloat green, GLfloat blue)
#define SIG( x ) fprintf( glw_state.log_fp, x "\n" ) #define SIG( x ) fprintf( glw_state.log_fp, x "\n" )
static void APIENTRY logColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
{
fprintf( glw_state.log_fp, "glColor4f( %f,%f,%f,%f )\n", red, green, blue, alpha );
dllColor4f( red, green, blue, alpha );
}
static void APIENTRY logColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) static void APIENTRY logColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
{ {
SIG( "glColorMask" ); SIG( "glColorMask" );
@ -530,21 +505,11 @@ static void APIENTRY logScissor(GLint x, GLint y, GLsizei width, GLsizei height)
fprintf( glw_state.log_fp, "glScissor( %d, %d, %d, %d )\n", x, y, width, height ); fprintf( glw_state.log_fp, "glScissor( %d, %d, %d, %d )\n", x, y, width, height );
dllScissor( x, y, width, height ); dllScissor( x, y, width, height );
} }
static void APIENTRY logShadeModel(GLenum mode)
{
SIG( "glShadeModel" );
dllShadeModel( mode );
}
static void APIENTRY logStencilFunc(GLenum func, GLint ref, GLuint mask) static void APIENTRY logStencilFunc(GLenum func, GLint ref, GLuint mask)
{ {
SIG( "glStencilFunc" ); SIG( "glStencilFunc" );
dllStencilFunc( func, ref, mask ); dllStencilFunc( func, ref, mask );
} }
static void APIENTRY logStencilMask(GLuint mask)
{
SIG( "glStencilMask" );
dllStencilMask( mask );
}
static void APIENTRY logStencilOp(GLenum fail, GLenum zfail, GLenum zpass) static void APIENTRY logStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
{ {
SIG( "glStencilOp" ); SIG( "glStencilOp" );
@ -641,11 +606,8 @@ void QGL_Shutdown( void )
qglBlendFunc = NULL; qglBlendFunc = NULL;
qglClear = NULL; qglClear = NULL;
qglClearColor = NULL; qglClearColor = NULL;
qglClearDepth = NULL;
qglClearStencil = NULL;
qglClipPlane = NULL; qglClipPlane = NULL;
qglColor3f = NULL; qglColor3f = NULL;
qglColor4f = NULL;
qglColorMask = NULL; qglColorMask = NULL;
qglColorPointer = NULL; qglColorPointer = NULL;
qglCullFace = NULL; qglCullFace = NULL;
@ -675,9 +637,7 @@ void QGL_Shutdown( void )
qglPushMatrix = NULL; qglPushMatrix = NULL;
qglReadPixels = NULL; qglReadPixels = NULL;
qglScissor = NULL; qglScissor = NULL;
qglShadeModel = NULL;
qglStencilFunc = NULL; qglStencilFunc = NULL;
qglStencilMask = NULL;
qglStencilOp = NULL; qglStencilOp = NULL;
qglTexCoord2f = NULL; qglTexCoord2f = NULL;
qglTexCoord2fv = NULL; qglTexCoord2fv = NULL;
@ -733,11 +693,8 @@ qboolean QGL_Init( const char *dllname )
qglBlendFunc = dllBlendFunc = (decltype(dllBlendFunc))GPA("glBlendFunc"); qglBlendFunc = dllBlendFunc = (decltype(dllBlendFunc))GPA("glBlendFunc");
qglClear = dllClear = (decltype(dllClear))GPA("glClear"); qglClear = dllClear = (decltype(dllClear))GPA("glClear");
qglClearColor = dllClearColor = (decltype(dllClearColor))GPA("glClearColor"); qglClearColor = dllClearColor = (decltype(dllClearColor))GPA("glClearColor");
qglClearDepth = dllClearDepth = (decltype(dllClearDepth))GPA("glClearDepth");
qglClearStencil = dllClearStencil = (decltype(dllClearStencil))GPA("glClearStencil");
qglClipPlane = dllClipPlane = (decltype(dllClipPlane))GPA("glClipPlane"); qglClipPlane = dllClipPlane = (decltype(dllClipPlane))GPA("glClipPlane");
qglColor3f = dllColor3f = (decltype(dllColor3f))GPA("glColor3f"); qglColor3f = dllColor3f = (decltype(dllColor3f))GPA("glColor3f");
qglColor4f = dllColor4f = (decltype(dllColor4f))GPA("glColor4f");
qglColorMask = dllColorMask = (decltype(dllColorMask))GPA("glColorMask"); qglColorMask = dllColorMask = (decltype(dllColorMask))GPA("glColorMask");
qglColorPointer = dllColorPointer = (decltype(dllColorPointer))GPA("glColorPointer"); qglColorPointer = dllColorPointer = (decltype(dllColorPointer))GPA("glColorPointer");
qglCullFace = dllCullFace = (decltype(dllCullFace))GPA("glCullFace"); qglCullFace = dllCullFace = (decltype(dllCullFace))GPA("glCullFace");
@ -767,9 +724,7 @@ qboolean QGL_Init( const char *dllname )
qglPushMatrix = dllPushMatrix = (decltype(dllPushMatrix))GPA("glPushMatrix"); qglPushMatrix = dllPushMatrix = (decltype(dllPushMatrix))GPA("glPushMatrix");
qglReadPixels = dllReadPixels = (decltype(dllReadPixels))GPA("glReadPixels"); qglReadPixels = dllReadPixels = (decltype(dllReadPixels))GPA("glReadPixels");
qglScissor = dllScissor = (decltype(dllScissor))GPA("glScissor"); qglScissor = dllScissor = (decltype(dllScissor))GPA("glScissor");
qglShadeModel = dllShadeModel = (decltype(dllShadeModel))GPA("glShadeModel");
qglStencilFunc = dllStencilFunc = (decltype(dllStencilFunc))GPA("glStencilFunc"); qglStencilFunc = dllStencilFunc = (decltype(dllStencilFunc))GPA("glStencilFunc");
qglStencilMask = dllStencilMask = (decltype(dllStencilMask))GPA("glStencilMask");
qglStencilOp = dllStencilOp = (decltype(dllStencilOp))GPA("glStencilOp"); qglStencilOp = dllStencilOp = (decltype(dllStencilOp))GPA("glStencilOp");
qglTexCoord2f = dllTexCoord2f = (decltype(dllTexCoord2f))GPA("glTexCoord2f"); qglTexCoord2f = dllTexCoord2f = (decltype(dllTexCoord2f))GPA("glTexCoord2f");
qglTexCoord2fv = dllTexCoord2fv = (decltype(dllTexCoord2fv))GPA("glTexCoord2fv"); qglTexCoord2fv = dllTexCoord2fv = (decltype(dllTexCoord2fv))GPA("glTexCoord2fv");
@ -849,11 +804,8 @@ void QGL_EnableLogging( qboolean enable )
qglBlendFunc = logBlendFunc; qglBlendFunc = logBlendFunc;
qglClear = logClear; qglClear = logClear;
qglClearColor = logClearColor; qglClearColor = logClearColor;
qglClearDepth = logClearDepth;
qglClearStencil = logClearStencil;
qglClipPlane = logClipPlane; qglClipPlane = logClipPlane;
qglColor3f = logColor3f; qglColor3f = logColor3f;
qglColor4f = logColor4f;
qglColorMask = logColorMask; qglColorMask = logColorMask;
qglColorPointer = logColorPointer; qglColorPointer = logColorPointer;
qglCullFace = logCullFace; qglCullFace = logCullFace;
@ -883,9 +835,7 @@ void QGL_EnableLogging( qboolean enable )
qglPushMatrix = logPushMatrix ; qglPushMatrix = logPushMatrix ;
qglReadPixels = logReadPixels ; qglReadPixels = logReadPixels ;
qglScissor = logScissor ; qglScissor = logScissor ;
qglShadeModel = logShadeModel ;
qglStencilFunc = logStencilFunc ; qglStencilFunc = logStencilFunc ;
qglStencilMask = logStencilMask ;
qglStencilOp = logStencilOp ; qglStencilOp = logStencilOp ;
qglTexCoord2f = logTexCoord2f ; qglTexCoord2f = logTexCoord2f ;
qglTexCoord2fv = logTexCoord2fv ; qglTexCoord2fv = logTexCoord2fv ;
@ -914,11 +864,8 @@ void QGL_EnableLogging( qboolean enable )
qglBlendFunc = dllBlendFunc; qglBlendFunc = dllBlendFunc;
qglClear = dllClear; qglClear = dllClear;
qglClearColor = dllClearColor; qglClearColor = dllClearColor;
qglClearDepth = dllClearDepth;
qglClearStencil = dllClearStencil;
qglClipPlane = dllClipPlane; qglClipPlane = dllClipPlane;
qglColor3f = dllColor3f; qglColor3f = dllColor3f;
qglColor4f = dllColor4f;
qglColorMask = dllColorMask; qglColorMask = dllColorMask;
qglColorPointer = dllColorPointer; qglColorPointer = dllColorPointer;
qglCullFace = dllCullFace; qglCullFace = dllCullFace;
@ -948,9 +895,7 @@ void QGL_EnableLogging( qboolean enable )
qglPushMatrix = dllPushMatrix ; qglPushMatrix = dllPushMatrix ;
qglReadPixels = dllReadPixels ; qglReadPixels = dllReadPixels ;
qglScissor = dllScissor ; qglScissor = dllScissor ;
qglShadeModel = dllShadeModel ;
qglStencilFunc = dllStencilFunc ; qglStencilFunc = dllStencilFunc ;
qglStencilMask = dllStencilMask ;
qglStencilOp = dllStencilOp ; qglStencilOp = dllStencilOp ;
qglTexCoord2f = dllTexCoord2f ; qglTexCoord2f = dllTexCoord2f ;
qglTexCoord2fv = dllTexCoord2fv ; qglTexCoord2fv = dllTexCoord2fv ;

5
src/engine/renderer/qgl.h
View File

@ -67,11 +67,8 @@ extern void ( APIENTRY * qglBindTexture )(GLenum target, GLuint texture);
extern void ( APIENTRY * qglBlendFunc )(GLenum sfactor, GLenum dfactor); extern void ( APIENTRY * qglBlendFunc )(GLenum sfactor, GLenum dfactor);
extern void ( APIENTRY * qglClear )(GLbitfield mask); extern void ( APIENTRY * qglClear )(GLbitfield mask);
extern void ( APIENTRY * qglClearColor )(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); extern void ( APIENTRY * qglClearColor )(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
extern void ( APIENTRY * qglClearDepth )(GLclampd depth);
extern void ( APIENTRY * qglClearStencil )(GLint s);
extern void ( APIENTRY * qglClipPlane )(GLenum plane, const GLdouble *equation); extern void ( APIENTRY * qglClipPlane )(GLenum plane, const GLdouble *equation);
extern void ( APIENTRY * qglColor3f )(GLfloat red, GLfloat green, GLfloat blue); extern void ( APIENTRY * qglColor3f )(GLfloat red, GLfloat green, GLfloat blue);
extern void ( APIENTRY * qglColor4f )(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
extern void ( APIENTRY * qglColorMask )(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); extern void ( APIENTRY * qglColorMask )(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
extern void ( APIENTRY * qglColorPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); extern void ( APIENTRY * qglColorPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
extern void ( APIENTRY * qglCullFace )(GLenum mode); extern void ( APIENTRY * qglCullFace )(GLenum mode);
@ -101,9 +98,7 @@ extern void ( APIENTRY * qglPopMatrix )(void);
extern void ( APIENTRY * qglPushMatrix )(void); extern void ( APIENTRY * qglPushMatrix )(void);
extern void ( APIENTRY * qglReadPixels )(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); extern void ( APIENTRY * qglReadPixels )(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
extern void ( APIENTRY * qglScissor )(GLint x, GLint y, GLsizei width, GLsizei height); extern void ( APIENTRY * qglScissor )(GLint x, GLint y, GLsizei width, GLsizei height);
extern void ( APIENTRY * qglShadeModel )(GLenum mode);
extern void ( APIENTRY * qglStencilFunc )(GLenum func, GLint ref, GLuint mask); extern void ( APIENTRY * qglStencilFunc )(GLenum func, GLint ref, GLuint mask);
extern void ( APIENTRY * qglStencilMask )(GLuint mask);
extern void ( APIENTRY * qglStencilOp )(GLenum fail, GLenum zfail, GLenum zpass); extern void ( APIENTRY * qglStencilOp )(GLenum fail, GLenum zfail, GLenum zpass);
extern void ( APIENTRY * qglTexCoord2f )(GLfloat s, GLfloat t); extern void ( APIENTRY * qglTexCoord2f )(GLfloat s, GLfloat t);
extern void ( APIENTRY * qglTexCoord2fv )(const GLfloat *v); extern void ( APIENTRY * qglTexCoord2fv )(const GLfloat *v);

2
src/engine/renderer/tr_cmds.c
View File

@ -333,8 +333,6 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
{ {
R_SyncRenderThread(); R_SyncRenderThread();
qglEnable( GL_STENCIL_TEST ); qglEnable( GL_STENCIL_TEST );
qglStencilMask( ~0U );
qglClearStencil( 0U );
qglStencilFunc( GL_ALWAYS, 0U, ~0U ); qglStencilFunc( GL_ALWAYS, 0U, ~0U );
qglStencilOp( GL_KEEP, GL_INCR, GL_INCR ); qglStencilOp( GL_KEEP, GL_INCR, GL_INCR );
} }

5
src/engine/renderer/tr_init.c
View File

@ -692,11 +692,9 @@ void R_ScreenShotJPEG_f (void) {
*/ */
void GL_SetDefaultState( void ) void GL_SetDefaultState( void )
{ {
qglClearDepth( 1.0f );
qglCullFace(GL_FRONT); qglCullFace(GL_FRONT);
qglColor4f (1,1,1,1); qglColor3f (1,1,1);
// initialize downstream texture unit // initialize downstream texture unit
GL_SelectTexture( 1 ); GL_SelectTexture( 1 );
@ -709,7 +707,6 @@ void GL_SetDefaultState( void )
GL_TextureMode( r_textureMode->string ); GL_TextureMode( r_textureMode->string );
GL_TexEnv( GL_MODULATE ); GL_TexEnv( GL_MODULATE );
qglShadeModel( GL_SMOOTH );
qglDepthFunc( GL_LEQUAL ); qglDepthFunc( GL_LEQUAL );
// the vertex array is always enabled, but the color and texture // the vertex array is always enabled, but the color and texture

2
src/engine/renderer/tr_shadows.c
View File

@ -289,7 +289,7 @@ void RB_ShadowFinish( void ) {
qglVertex3f( -100, -100, -10 ); qglVertex3f( -100, -100, -10 );
qglEnd (); qglEnd ();
qglColor4f(1,1,1,1); qglColor3f(1,1,1);
qglDisable( GL_STENCIL_TEST ); qglDisable( GL_STENCIL_TEST );
} }