mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-23 02:41:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

remove deprecated OpenGL functions

Browse source
This commit is contained in:
Ted John 2016-06-11 17:46:54 +01:00
parent e3ecb91b91
commit 33799d2ab9
2 changed files with 0 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/drawing/engines/opengl/OpenGLAPI.cpp
View file

@ -55,8 +55,6 @@ static const char * TryLoadAllProcAddresses()
SetupOpenGLFunction(glBlendFunc); SetupOpenGLFunction(glBlendFunc);
SetupOpenGLFunction(glClear); SetupOpenGLFunction(glClear);
SetupOpenGLFunction(glClearColor); SetupOpenGLFunction(glClearColor);
SetupOpenGLFunction(glColor3f);
SetupOpenGLFunction(glColor4f);
SetupOpenGLFunction(glCullFace); SetupOpenGLFunction(glCullFace);
SetupOpenGLFunction(glDeleteTextures); SetupOpenGLFunction(glDeleteTextures);
SetupOpenGLFunction(glDisable); SetupOpenGLFunction(glDisable);
@ -65,16 +63,9 @@ static const char * TryLoadAllProcAddresses()
SetupOpenGLFunction(glEnd); SetupOpenGLFunction(glEnd);
SetupOpenGLFunction(glGenTextures); SetupOpenGLFunction(glGenTextures);
SetupOpenGLFunction(glGetError); SetupOpenGLFunction(glGetError);
SetupOpenGLFunction(glLoadIdentity);
SetupOpenGLFunction(glMatrixMode);
SetupOpenGLFunction(glOrtho);
SetupOpenGLFunction(glReadPixels); SetupOpenGLFunction(glReadPixels);
SetupOpenGLFunction(glScalef);
SetupOpenGLFunction(glTexCoord2f);
SetupOpenGLFunction(glTexImage2D); SetupOpenGLFunction(glTexImage2D);
SetupOpenGLFunction(glTexParameteri); SetupOpenGLFunction(glTexParameteri);
SetupOpenGLFunction(glTranslatef);
SetupOpenGLFunction(glVertex2i);
SetupOpenGLFunction(glViewport); SetupOpenGLFunction(glViewport);
// 2.0+ functions // 2.0+ functions

36
src/drawing/engines/opengl/OpenGLAPI.h
View file

@ -25,8 +25,6 @@
#define glBlendFunc __static__glBlendFunc #define glBlendFunc __static__glBlendFunc
#define glClear __static__glClear #define glClear __static__glClear
#define glClearColor __static__glClearColor #define glClearColor __static__glClearColor
#define glColor3f __static__glColor3f
#define glColor4f __static__glColor4f
#define glCullFace __static__glCullFace #define glCullFace __static__glCullFace
#define glDeleteTextures __static__glDeleteTextures #define glDeleteTextures __static__glDeleteTextures
#define glDisable __static__glDisable #define glDisable __static__glDisable
@ -35,16 +33,9 @@
#define glEnd __static__glEnd #define glEnd __static__glEnd
#define glGenTextures __static__glGenTextures #define glGenTextures __static__glGenTextures
#define glGetError __static__glGetError #define glGetError __static__glGetError
#define glLoadIdentity __static__glLoadIdentity
#define glMatrixMode __static__glMatrixMode
#define glOrtho __static__glOrtho
#define glReadPixels __static__glReadPixels #define glReadPixels __static__glReadPixels
#define glScalef __static__glScalef
#define glTexCoord2f __static__glTexCoord2f
#define glTexImage2D __static__glTexImage2D #define glTexImage2D __static__glTexImage2D
#define glTexParameteri __static__glTexParameteri #define glTexParameteri __static__glTexParameteri
#define glTranslatef __static__glTranslatef
#define glVertex2i __static__glVertex2i
#define glViewport __static__glViewport #define glViewport __static__glViewport
#endif #endif
@ -60,8 +51,6 @@
#undef glBlendFunc #undef glBlendFunc
#undef glClear #undef glClear
#undef glClearColor #undef glClearColor
#undef glColor3f
#undef glColor4f
#undef glCullFace #undef glCullFace
#undef glDeleteTextures #undef glDeleteTextures
#undef glDisable #undef glDisable
@ -70,16 +59,9 @@
#undef glEnd #undef glEnd
#undef glGenTextures #undef glGenTextures
#undef glGetError #undef glGetError
#undef glLoadIdentity
#undef glMatrixMode
#undef glOrtho
#undef glReadPixels #undef glReadPixels
#undef glScalef
#undef glTexCoord2f
#undef glTexImage2D #undef glTexImage2D
#undef glTexParameteri #undef glTexParameteri
#undef glTranslatef
#undef glVertex2i
#undef glViewport #undef glViewport
// 1.1 function signatures // 1.1 function signatures
@ -88,8 +70,6 @@ typedef void (APIENTRYP PFNGLBINDTEXTUREPROC )(GLenum target, GLuint texture
typedef void (APIENTRYP PFNGLBLENDFUNCPROC )(GLenum sfactor, GLenum dfactor); typedef void (APIENTRYP PFNGLBLENDFUNCPROC )(GLenum sfactor, GLenum dfactor);
typedef void (APIENTRYP PFNGLCLEARPROC )(GLbitfield mask); typedef void (APIENTRYP PFNGLCLEARPROC )(GLbitfield mask);
typedef void (APIENTRYP PFNGLCLEARCOLORPROC )(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); typedef void (APIENTRYP PFNGLCLEARCOLORPROC )(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
typedef void (APIENTRYP PFNGLCOLOR3FPROC )(GLfloat red, GLfloat green, GLfloat blue);
typedef void (APIENTRYP PFNGLCOLOR4FPROC )(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
typedef void (APIENTRYP PFNGLCULLFACEPROC )(GLenum mode); typedef void (APIENTRYP PFNGLCULLFACEPROC )(GLenum mode);
typedef void (APIENTRYP PFNGLDELETETEXTURESPROC)(GLsizei n, const GLuint *textures); typedef void (APIENTRYP PFNGLDELETETEXTURESPROC)(GLsizei n, const GLuint *textures);
typedef void (APIENTRYP PFNGLDISABLEPROC )(GLenum cap); typedef void (APIENTRYP PFNGLDISABLEPROC )(GLenum cap);
@ -98,16 +78,9 @@ typedef void (APIENTRYP PFNGLENABLEPROC )(GLenum cap);
typedef void (APIENTRYP PFNGLENDPROC )(void); typedef void (APIENTRYP PFNGLENDPROC )(void);
typedef GLenum (APIENTRYP PFNGLGETERRORPROC )(void); typedef GLenum (APIENTRYP PFNGLGETERRORPROC )(void);
typedef void (APIENTRYP PFNGLGENTEXTURESPROC )(GLsizei n, GLuint *textures); typedef void (APIENTRYP PFNGLGENTEXTURESPROC )(GLsizei n, GLuint *textures);
typedef void (APIENTRYP PFNGLLOADIDENTITYPROC )(void);
typedef void (APIENTRYP PFNGLMATRIXMODEPROC )(GLenum mode);
typedef void (APIENTRYP PFNGLORTHOPROC )(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val);
typedef void (APIENTRYP PFNGLREADPIXELSPROC )(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid * pixels); typedef void (APIENTRYP PFNGLREADPIXELSPROC )(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid * pixels);
typedef void (APIENTRYP PFNGLSCALEFPROC )(GLfloat x, GLfloat y, GLfloat z);
typedef void (APIENTRYP PFNGLTEXCOORD2FPROC )(GLfloat s, GLfloat t);
typedef void (APIENTRYP PFNGLTEXIMAGE2DPROC )(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); typedef void (APIENTRYP PFNGLTEXIMAGE2DPROC )(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
typedef void (APIENTRYP PFNGLTEXPARAMETERIPROC )(GLenum target, GLenum pname, GLint param); typedef void (APIENTRYP PFNGLTEXPARAMETERIPROC )(GLenum target, GLenum pname, GLint param);
typedef void (APIENTRYP PFNGLTRANSLATEFPROC )(GLfloat x, GLfloat y, GLfloat z);
typedef void (APIENTRYP PFNGLVERTEX2IPROC )(GLint x, GLint y);
typedef void (APIENTRYP PFNGLVIEWPORTPROC )(GLint x, GLint y, GLsizei width, GLsizei height); typedef void (APIENTRYP PFNGLVIEWPORTPROC )(GLint x, GLint y, GLsizei width, GLsizei height);
#ifdef NO_EXTERN_GLAPI #ifdef NO_EXTERN_GLAPI
@ -127,8 +100,6 @@ GLAPI_DECL PFNGLBINDTEXTUREPROC glBindTexture GLAP
GLAPI_DECL PFNGLBLENDFUNCPROC glBlendFunc GLAPI_SET; GLAPI_DECL PFNGLBLENDFUNCPROC glBlendFunc GLAPI_SET;
GLAPI_DECL PFNGLCLEARPROC glClear GLAPI_SET; GLAPI_DECL PFNGLCLEARPROC glClear GLAPI_SET;
GLAPI_DECL PFNGLCLEARCOLORPROC glClearColor GLAPI_SET; GLAPI_DECL PFNGLCLEARCOLORPROC glClearColor GLAPI_SET;
GLAPI_DECL PFNGLCOLOR3FPROC glColor3f GLAPI_SET;
GLAPI_DECL PFNGLCOLOR4FPROC glColor4f GLAPI_SET;
GLAPI_DECL PFNGLCULLFACEPROC glCullFace GLAPI_SET; GLAPI_DECL PFNGLCULLFACEPROC glCullFace GLAPI_SET;
GLAPI_DECL PFNGLDELETETEXTURESPROC glDeleteTextures GLAPI_SET; GLAPI_DECL PFNGLDELETETEXTURESPROC glDeleteTextures GLAPI_SET;
GLAPI_DECL PFNGLDISABLEPROC glDisable GLAPI_SET; GLAPI_DECL PFNGLDISABLEPROC glDisable GLAPI_SET;
@ -137,16 +108,9 @@ GLAPI_DECL PFNGLENABLEPROC glEnable GLAP
GLAPI_DECL PFNGLENDPROC glEnd GLAPI_SET; GLAPI_DECL PFNGLENDPROC glEnd GLAPI_SET;
GLAPI_DECL PFNGLGENTEXTURESPROC glGenTextures GLAPI_SET; GLAPI_DECL PFNGLGENTEXTURESPROC glGenTextures GLAPI_SET;
GLAPI_DECL PFNGLGETERRORPROC glGetError GLAPI_SET; GLAPI_DECL PFNGLGETERRORPROC glGetError GLAPI_SET;
GLAPI_DECL PFNGLLOADIDENTITYPROC glLoadIdentity GLAPI_SET;
GLAPI_DECL PFNGLMATRIXMODEPROC glMatrixMode GLAPI_SET;
GLAPI_DECL PFNGLORTHOPROC glOrtho GLAPI_SET;
GLAPI_DECL PFNGLREADPIXELSPROC glReadPixels GLAPI_SET; GLAPI_DECL PFNGLREADPIXELSPROC glReadPixels GLAPI_SET;
GLAPI_DECL PFNGLSCALEFPROC glScalef GLAPI_SET;
GLAPI_DECL PFNGLTEXCOORD2FPROC glTexCoord2f GLAPI_SET;
GLAPI_DECL PFNGLTEXIMAGE2DPROC glTexImage2D GLAPI_SET; GLAPI_DECL PFNGLTEXIMAGE2DPROC glTexImage2D GLAPI_SET;
GLAPI_DECL PFNGLTEXPARAMETERIPROC glTexParameteri GLAPI_SET; GLAPI_DECL PFNGLTEXPARAMETERIPROC glTexParameteri GLAPI_SET;
GLAPI_DECL PFNGLTRANSLATEFPROC glTranslatef GLAPI_SET;
GLAPI_DECL PFNGLVERTEX2IPROC glVertex2i GLAPI_SET;
GLAPI_DECL PFNGLVIEWPORTPROC glViewport GLAPI_SET; GLAPI_DECL PFNGLVIEWPORTPROC glViewport GLAPI_SET;
// 2.0+ function pointers // 2.0+ function pointers