From 7b550200f05c8a9e436617a708774f77c5e35ef9 Mon Sep 17 00:00:00 2001 From: Indev Date: Thu, 12 Dec 2024 17:52:36 +0300 Subject: [PATCH] Change gl_extension to use glGetStringi instead of glGetString --- src/hardware/hw_main.c | 5 +++-- src/hardware/r_opengl/ogl_win.c | 22 ++++++++++++++++---- src/hardware/r_opengl/r_opengl.c | 35 ++++++++++++-------------------- src/hardware/r_opengl/r_opengl.h | 7 +++++-- src/sdl/ogl_sdl.c | 19 ++++++++++++++--- 5 files changed, 55 insertions(+), 33 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 3a9cc3319..ef2a4cd72 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -5623,7 +5623,6 @@ static void COM_HWR_glinfo(void) CONS_Printf("Unrecognized argument: %s\n", argv); return; } - } CONS_Printf("\x88OpenGL %s\x80\n", gl_version); @@ -5633,7 +5632,9 @@ static void COM_HWR_glinfo(void) CONS_Printf("%u GL extensions present.\n", gl_num_extensions); if (list_extensions) { - CONS_Printf("%s\n", gl_extensions); + for (GLuint i = 0; i < gl_num_extensions; ++i) + CONS_Printf("%s ", gl_extensions[i]); + CONS_Printf("\n"); } else { diff --git a/src/hardware/r_opengl/ogl_win.c b/src/hardware/r_opengl/ogl_win.c index 8ce44d788..782010ce9 100644 --- a/src/hardware/r_opengl/ogl_win.c +++ b/src/hardware/r_opengl/ogl_win.c @@ -55,6 +55,7 @@ PFNWGLEXTSWAPCONTROLPROC wglSwapIntervalEXT = NULL; PFNglClear pglClear; PFNglGetIntegerv pglGetIntegerv; PFNglGetString pglGetString; +PFNglGetStringi pglGetStringi; #define MAX_VIDEO_MODES 32 static vmode_t video_modes[MAX_VIDEO_MODES]; @@ -323,7 +324,16 @@ static INT32 WINAPI SetRes(viddef_t *lvid, vmode_t *pcurrentmode) } } - gl_extensions = pglGetString(GL_EXTENSIONS); + pglGetIntegerv(GL_NUM_EXTENSIONS, (GLint*)&gl_num_extensions); + + if (gl_extensions != NULL) + free(gl_extensions); + + gl_extensions = calloc(gl_num_extensions, sizeof(GLubyte*)); + + for (GLuint i = 0; i < gl_num_extensions; ++i) + gl_extensions[i] = pglGetStringi(GL_EXTENSIONS, i); + // Get info and extensions. //BP: why don't we make it earlier ? //Hurdler: we cannot do that before intialising gl context @@ -331,7 +341,11 @@ static INT32 WINAPI SetRes(viddef_t *lvid, vmode_t *pcurrentmode) DBG_Printf("Vendor : %s\n", pglGetString(GL_VENDOR)); DBG_Printf("Renderer : %s\n", renderer); DBG_Printf("Version : %s\n", pglGetString(GL_VERSION)); - DBG_Printf("Extensions : %s\n", gl_extensions); + DBG_Printf("Extensions :"); + + for (GLuint i = 0; i < gl_num_extensions; ++i) + DBG_Printf(" %s", gl_extensions[i]); + DBG_Printf("\n"); // BP: disable advenced feature that don't work on somes hardware // Hurdler: Now works on G400 with bios 1.6 and certified drivers 6.04 @@ -339,13 +353,13 @@ static INT32 WINAPI SetRes(viddef_t *lvid, vmode_t *pcurrentmode) DBG_Printf("oglflags : 0x%X\n", oglflags); #ifdef USE_WGL_SWAP - if (isExtAvailable("WGL_EXT_swap_control",gl_extensions)) + if (isExtAvailable("WGL_EXT_swap_control")) wglSwapIntervalEXT = GetGLFunc("wglSwapIntervalEXT"); else wglSwapIntervalEXT = NULL; #endif - if (isExtAvailable("GL_EXT_texture_filter_anisotropic",gl_extensions)) + if (isExtAvailable("GL_EXT_texture_filter_anisotropic")) pglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maximumAnisotropy); else maximumAnisotropy = 0; diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index f411f9202..af2e5abad 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -113,10 +113,10 @@ static GLint anisotropic_filter = 0; boolean supportMipMap = false; static FTransform md2_transform; -const GLubyte *gl_version = NULL; -const GLubyte *gl_renderer = NULL; -const GLubyte *gl_extensions = NULL; -const GLubyte *gl_vendor = NULL; +const GLubyte *gl_version = NULL; +const GLubyte *gl_renderer = NULL; +const GLubyte **gl_extensions = NULL; +const GLubyte *gl_vendor = NULL; GLuint gl_num_extensions; // Loaded OpenGL version @@ -544,6 +544,7 @@ boolean SetupGLfunc(void) GETOPENGLFUNC(pglGetFloatv, glGetFloatv) GETOPENGLFUNC(pglGetIntegerv, glGetIntegerv) GETOPENGLFUNC(pglGetString, glGetString) + GETOPENGLFUNC(pglGetStringi, glGetStringi) GETOPENGLFUNC(pglClearDepth, glClearDepth) GETOPENGLFUNC(pglDepthFunc, glDepthFunc) @@ -721,7 +722,7 @@ static boolean GLFramebuffer_CheckExt(void) return false; // check if all needed gl extensions are available - return (isExtAvailable("GL_ARB_framebuffer_no_attachments", gl_extensions) && isExtAvailable("GL_ARB_framebuffer_object", gl_extensions) && isExtAvailable("GL_ARB_framebuffer_sRGB", gl_extensions)); + return (isExtAvailable("GL_ARB_framebuffer_no_attachments") && isExtAvailable("GL_ARB_framebuffer_object") && isExtAvailable("GL_ARB_framebuffer_sRGB")); } #endif @@ -1217,26 +1218,16 @@ void Flush(void) // isExtAvailable : Look if an OpenGL extension is available // Returns : true if extension available // -----------------+ -INT32 isExtAvailable(const char *extension, const GLubyte *start) +INT32 isExtAvailable(const char *extension) { - GLubyte *where, *terminator; - - if (!extension || !start) return 0; - where = (GLubyte *) strchr(extension, ' '); - if (where || *extension == '\0') + // Shouldn't really happen + if (gl_extensions == NULL) return 0; - for (;;) - { - where = (GLubyte *) strstr((const char *) start, extension); - if (!where) - break; - terminator = where + strlen(extension); - if (where == start || *(where - 1) == ' ') - if (*terminator == ' ' || *terminator == '\0') - return 1; - start = terminator; - } + for (GLuint i = 0; i < gl_num_extensions; ++i) + if (strcmp((const char*)gl_extensions[i], extension) == 0) + return 1; + return 0; } diff --git a/src/hardware/r_opengl/r_opengl.h b/src/hardware/r_opengl/r_opengl.h index 0762afde0..77502682f 100644 --- a/src/hardware/r_opengl/r_opengl.h +++ b/src/hardware/r_opengl/r_opengl.h @@ -70,7 +70,7 @@ void *GetGLFunc(const char *proc); boolean SetupGLfunc(void); void SetupGLFunc4(void); void Flush(void); -INT32 isExtAvailable(const char *extension, const GLubyte *start); +INT32 isExtAvailable(const char *extension); void SetModelView(GLint w, GLint h); void SetStates(void); @@ -90,6 +90,7 @@ extern PFNWGLEXTGETSWAPINTERVALPROC wglGetSwapIntervalEXT; #define pglClear glClear #define pglGetIntegerv glGetIntegerv #define pglGetString glGetString +#define pglGetStringi glGetStringi #else /* 1.0 Miscellaneous functions */ typedef void (APIENTRY * PFNglClear) (GLbitfield mask); @@ -98,6 +99,8 @@ typedef void (APIENTRY * PFNglGetIntegerv) (GLenum pname, GLint *params); extern PFNglGetIntegerv pglGetIntegerv; typedef const GLubyte* (APIENTRY * PFNglGetString) (GLenum name); extern PFNglGetString pglGetString; +typedef const GLubyte* (APIENTRY * PFNglGetStringi) (GLenum name, GLuint index); +extern PFNglGetStringi pglGetStringi; #endif #ifdef USE_FBO_OGL @@ -118,7 +121,7 @@ extern boolean supportFBO; extern const GLubyte *gl_version; extern const GLubyte *gl_renderer; -extern const GLubyte *gl_extensions; +extern const GLubyte **gl_extensions; extern const GLubyte *gl_vendor; extern GLuint gl_num_extensions; diff --git a/src/sdl/ogl_sdl.c b/src/sdl/ogl_sdl.c index fa18c0b1b..7face874b 100644 --- a/src/sdl/ogl_sdl.c +++ b/src/sdl/ogl_sdl.c @@ -66,6 +66,7 @@ PFNGLXSWAPINTERVALPROC glXSwapIntervalSGIEXT = NULL; PFNglClear pglClear; PFNglGetIntegerv pglGetIntegerv; PFNglGetString pglGetString; +PFNglGetStringi pglGetStringi; #endif #ifdef USE_FBO_OGL @@ -148,13 +149,25 @@ boolean OglSdlSurface(INT32 w, INT32 h) gl_version = pglGetString(GL_VERSION); gl_renderer = pglGetString(GL_RENDERER); - gl_extensions = pglGetString(GL_EXTENSIONS); pglGetIntegerv(GL_NUM_EXTENSIONS, (GLint*)&gl_num_extensions); + + if (gl_extensions != NULL) + free(gl_extensions); + + gl_extensions = calloc(gl_num_extensions, sizeof(GLubyte*)); + + for (GLuint i = 0; i < gl_num_extensions; ++i) + gl_extensions[i] = pglGetStringi(GL_EXTENSIONS, i); + gl_vendor = pglGetString(GL_VENDOR); GL_DBG_Printf("OpenGL %s\n", gl_version); GL_DBG_Printf("GPU: %s\n", gl_renderer); - GL_DBG_Printf("Extensions: %s\n", gl_extensions); + + GL_DBG_Printf("Extensions:"); + for (GLuint i = 0; i < gl_num_extensions; ++i) + GL_DBG_Printf(" %s", gl_extensions[i]); + GL_DBG_Printf("\n"); if (strcmp((const char*)gl_renderer, "GDI Generic") == 0 && strcmp((const char*)gl_version, "1.1.0") == 0) @@ -178,7 +191,7 @@ boolean OglSdlSurface(INT32 w, INT32 h) else supportMipMap = true; - if (isExtAvailable("GL_EXT_texture_filter_anisotropic", gl_extensions)) + if (isExtAvailable("GL_EXT_texture_filter_anisotropic")) pglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maximumAnisotropy); else maximumAnisotropy = 1;