id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-02-22 03:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove deprecated glShadeModel stuff

Browse source 
it's only for fixed function opengl, thus it's not needed and deprecated in OpenGL 3.2
AMD's driver complains about this.
This commit is contained in:
Daniel Gibson 2012-12-17 01:02:53 +01:00
parent ddaa0c8f70
commit e42a886b29
5 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
neo/renderer/OpenGL/gl_GraphicsAPIWrapper.cpp
View file

@ -290,7 +290,9 @@ void GL_SetDefaultState()
qglPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
// These should never be changed
qglShadeModel( GL_SMOOTH );
// DG: deprecated in opengl 3.2 and not needed because we don't do fixed function pipeline
// qglShadeModel( GL_SMOOTH );
// DG end
qglEnable( GL_DEPTH_TEST );
qglEnable( GL_BLEND );
qglEnable( GL_SCISSOR_TEST );

4
neo/renderer/OpenGL/qgl.h
View file

@ -428,7 +428,9 @@ extern void ( APIENTRY* qglScaled )( GLdouble x, GLdouble y, GLdouble z );
extern void ( APIENTRY* qglScalef )( GLfloat x, GLfloat y, GLfloat z );
extern void ( APIENTRY* qglScissor )( GLint x, GLint y, GLsizei width, GLsizei height );
extern void ( APIENTRY* qglSelectBuffer )( GLsizei size, GLuint* buffer );
extern void ( APIENTRY* qglShadeModel )( GLenum mode );
// DG: deprecated in opengl 3.2 and not needed because we don't do fixed function pipeline
// extern void ( APIENTRY* qglShadeModel )( GLenum mode );
// DG end
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 );

4
neo/renderer/OpenGL/qgl_linked.h
View file

@ -279,7 +279,9 @@ If you have questions concerning this license or the applicable additional terms
#define qglScalef glScalef
#define qglScissor glScissor
#define qglSelectBuffer glSelectBuffer
#define qglShadeModel glShadeModel
// DG: deprecated in opengl 3.2 and not needed because we don't do fixed function pipeline
// #define qglShadeModel glShadeModel
// DG: deprecated in opengl 3.2 and not needed because we don't do fixed function pipeline
#define qglStencilFunc glStencilFunc
#define qglStencilMask glStencilMask
#define qglStencilOp glStencilOp

8
neo/sys/sdl/sdl_qgl.cpp
View file

@ -1507,7 +1507,9 @@ void QGL_Shutdown( void )
qglScalef = NULL;
qglScissor = NULL;
qglSelectBuffer = NULL;
qglShadeModel = NULL;
// DG: deprecated in opengl 3.2 and not needed because we don't do fixed function pipeline
// qglShadeModel = NULL;
// DG end
qglStencilFunc = NULL;
qglStencilMask = NULL;
qglStencilOp = NULL;
@ -1902,7 +1904,9 @@ bool QGL_Init( const char* dllname )
qglScalef = dllScalef = glScalef;
qglScissor = dllScissor = glScissor;
qglSelectBuffer = dllSelectBuffer = glSelectBuffer;
qglShadeModel = dllShadeModel = glShadeModel;
// DG: deprecated in opengl 3.2 and not needed because we don't do fixed function pipeline
// qglShadeModel = dllShadeModel = glShadeModel;
// DG end
qglStencilFunc = dllStencilFunc = glStencilFunc;
qglStencilMask = dllStencilMask = glStencilMask;
qglStencilOp = dllStencilOp = glStencilOp;

12
neo/sys/win32/win_qgl.cpp
View file

@ -325,7 +325,9 @@ void ( APIENTRY* qglScaled )( GLdouble x, GLdouble y, GLdouble z );
void ( APIENTRY* qglScalef )( GLfloat x, GLfloat y, GLfloat z );
void ( APIENTRY* qglScissor )( GLint x, GLint y, GLsizei width, GLsizei height );
void ( APIENTRY* qglSelectBuffer )( GLsizei size, GLuint* buffer );
void ( APIENTRY* qglShadeModel )( GLenum mode );
// DG: deprecated in opengl 3.2 and not needed because we don't do fixed function pipeline
// void ( APIENTRY* qglShadeModel )( GLenum mode );
// DG end
void ( APIENTRY* qglStencilFunc )( GLenum func, GLint ref, GLuint mask );
void ( APIENTRY* qglStencilMask )( GLuint mask );
void ( APIENTRY* qglStencilOp )( GLenum fail, GLenum zfail, GLenum zpass );
@ -664,7 +666,9 @@ static void ( APIENTRY* dllScaled )( GLdouble x, GLdouble y, GLdouble z );
static void ( APIENTRY* dllScalef )( GLfloat x, GLfloat y, GLfloat z );
static void ( APIENTRY* dllScissor )( GLint x, GLint y, GLsizei width, GLsizei height );
static void ( APIENTRY* dllSelectBuffer )( GLsizei size, GLuint* buffer );
static void ( APIENTRY* dllShadeModel )( GLenum mode );
// DG: deprecated in opengl 3.2 and not needed because we don't do fixed function pipeline
// static void ( APIENTRY* dllShadeModel )( GLenum mode );
// DG end
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 );
@ -1895,7 +1899,9 @@ bool QGL_Init( const char* dllname )
qglScalef = dllScalef = glScalef;
qglScissor = dllScissor = glScissor;
qglSelectBuffer = dllSelectBuffer = glSelectBuffer;
qglShadeModel = dllShadeModel = glShadeModel;
// DG: deprecated in opengl 3.2 and not needed because we don't do fixed function pipeline
// qglShadeModel = dllShadeModel = glShadeModel;
// DG end
qglStencilFunc = dllStencilFunc = glStencilFunc;
qglStencilMask = dllStencilMask = glStencilMask;
qglStencilOp = dllStencilOp = glStencilOp;