From 7b7fdbbeff593a38ff30504f44ab8e9da149c9e8 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sat, 30 Oct 2021 15:33:53 +1100 Subject: [PATCH] Fix compilation errors --- src/Graphics_GL1.c | 32 ++++++++++++++++---------------- src/_GLShared.h | 9 ++++++--- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/Graphics_GL1.c b/src/Graphics_GL1.c index 2756532f0..fe09280df 100644 --- a/src/Graphics_GL1.c +++ b/src/Graphics_GL1.c @@ -108,39 +108,39 @@ GLAPI void APIENTRY glCallList(GLuint list); GLAPI void APIENTRY glClear(GLuint mask); GLAPI void APIENTRY glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); GLAPI void APIENTRY glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -GLAPI void APIENTRY glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); +GLAPI void APIENTRY glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid* pointer); GLAPI void APIENTRY glDeleteLists(GLuint list, GLsizei range); -GLAPI void APIENTRY glDeleteTextures(GLsizei n, const GLuint *textures); +GLAPI void APIENTRY glDeleteTextures(GLsizei n, const GLuint* textures); GLAPI void APIENTRY glDepthFunc(GLenum func); GLAPI void APIENTRY glDepthMask(GLboolean flag); GLAPI void APIENTRY glDisable(GLenum cap); GLAPI void APIENTRY glDisableClientState(GLenum array); GLAPI void APIENTRY glDrawArrays(GLenum mode, GLint first, GLsizei count); -GLAPI void APIENTRY glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices); +GLAPI void APIENTRY glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid* indices); GLAPI void APIENTRY glEnable(GLenum cap); GLAPI void APIENTRY glEnableClientState(GLenum array); GLAPI void APIENTRY glEndList(void); GLAPI void APIENTRY glFogf(GLenum pname, GLfloat param); -GLAPI void APIENTRY glFogfv(GLenum pname, const GLfloat *params); +GLAPI void APIENTRY glFogfv(GLenum pname, const GLfloat* params); GLAPI void APIENTRY glFogi(GLenum pname, GLint param); -GLAPI void APIENTRY glFogiv(GLenum pname, const GLint *params); +GLAPI void APIENTRY glFogiv(GLenum pname, const GLint* params); GLAPI GLuint APIENTRY glGenLists(GLsizei range); -GLAPI void APIENTRY glGenTextures(GLsizei n, GLuint *textures); +GLAPI void APIENTRY glGenTextures(GLsizei n, GLuint* textures); GLAPI GLenum APIENTRY glGetError(void); -GLAPI void APIENTRY glGetFloatv(GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetIntegerv(GLenum pname, GLint *params); -GLAPI const GLubyte * APIENTRY glGetString(GLenum name); +GLAPI void APIENTRY glGetFloatv(GLenum pname, GLfloat* params); +GLAPI void APIENTRY glGetIntegerv(GLenum pname, GLint* params); +GLAPI const GLubyte* APIENTRY glGetString(GLenum name); GLAPI void APIENTRY glHint(GLenum target, GLenum mode); GLAPI void APIENTRY glLoadIdentity(void); -GLAPI void APIENTRY glLoadMatrixf(const GLfloat *m); +GLAPI void APIENTRY glLoadMatrixf(const GLfloat* m); GLAPI void APIENTRY glMatrixMode(GLenum mode); GLAPI void APIENTRY glNewList(GLuint list, GLenum mode); -GLAPI void APIENTRY glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); -GLAPI void APIENTRY glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); +GLAPI void APIENTRY glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels); +GLAPI void APIENTRY glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid* pointer); +GLAPI void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels); GLAPI void APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); +GLAPI void APIENTRY glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels); +GLAPI void APIENTRY glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid* pointer); GLAPI void APIENTRY glViewport(GLint x, GLint y, GLsizei width, GLsizei height); /* === END OPENGL HEADERS === */ @@ -469,7 +469,7 @@ static void APIENTRY fake_glBufferSubData(GLenum target, cc_uintptr offset, cc_u Mem_Copy(buffer->data, data, size); } -static void GL_CheckSupport(void) { +static void GLBackend_Init(void) { static const struct DynamicLibSym coreVboFuncs[5] = { DynamicLib_Sym2("glBindBuffer", glBindBuffer), DynamicLib_Sym2("glDeleteBuffers", glDeleteBuffers), DynamicLib_Sym2("glGenBuffers", glGenBuffers), DynamicLib_Sym2("glBufferData", glBufferData), diff --git a/src/_GLShared.h b/src/_GLShared.h index 248ae7a70..1f38411b8 100644 --- a/src/_GLShared.h +++ b/src/_GLShared.h @@ -1,14 +1,17 @@ +#define _GL_TEXTURE_MAX_LEVEL 0x813D +#define _GL_BGRA_EXT 0x80E1 +#define _GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 + #if defined CC_BUILD_WEB || defined CC_BUILD_ANDROID #define PIXEL_FORMAT GL_RGBA #else -#define PIXEL_FORMAT GL_BGRA_EXT +#define PIXEL_FORMAT _GL_BGRA_EXT #endif -#define _GL_TEXTURE_MAX_LEVEL 0x813D #if defined CC_BIG_ENDIAN /* Pixels are stored in memory as A,R,G,B but GL_UNSIGNED_BYTE will interpret as B,G,R,A */ /* So use GL_UNSIGNED_INT_8_8_8_8_REV instead to remedy this */ -#define TRANSFER_FORMAT GL_UNSIGNED_INT_8_8_8_8_REV +#define TRANSFER_FORMAT _GL_UNSIGNED_INT_8_8_8_8_REV #else /* Pixels are stored in memory as B,G,R,A and GL_UNSIGNED_BYTE will interpret as B,G,R,A */ /* So fine to just use GL_UNSIGNED_BYTE here */