Revert "Change gl_extension to use glGetStringi instead of glGetString"

This reverts commit 7b550200f0.

Not supported on opengl version before 3.0 unfortunately
This commit is contained in:
indev committed 2024-12-12 18:03:16 +03:00
1 parent 7b550200f0
commit 1cbfc71fc6
5 files changed
+33 -55

No files matched your search

+2 -3
View File
@@ -5623,6 +5623,7 @@ static void COM_HWR_glinfo(void)
CONS_Printf("Unrecognized argument: %s\n", argv);
return;
}
}
CONS_Printf("\x88OpenGL %s\x80\n", gl_version);
@@ -5632,9 +5633,7 @@ static void COM_HWR_glinfo(void)
CONS_Printf("%u GL extensions present.\n", gl_num_extensions);
if (list_extensions)
{
for (GLuint i = 0; i < gl_num_extensions; ++i)
CONS_Printf("%s ", gl_extensions[i]);
CONS_Printf("\n");
CONS_Printf("%s\n", gl_extensions);
}
else
{
+4 -18
View File
@@ -55,7 +55,6 @@ PFNWGLEXTSWAPCONTROLPROC wglSwapIntervalEXT = NULL;
PFNglClear pglClear;
PFNglGetIntegerv pglGetIntegerv;
PFNglGetString pglGetString;
PFNglGetStringi pglGetStringi;
#define MAX_VIDEO_MODES 32
static vmode_t video_modes[MAX_VIDEO_MODES];
@@ -324,16 +323,7 @@ static INT32 WINAPI SetRes(viddef_t *lvid, vmode_t *pcurrentmode)
}
}
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_extensions = pglGetString(GL_EXTENSIONS);
// Get info and extensions.
//BP: why don't we make it earlier ?
//Hurdler: we cannot do that before intialising gl context
@@ -341,11 +331,7 @@ 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 :");
for (GLuint i = 0; i < gl_num_extensions; ++i)
DBG_Printf(" %s", gl_extensions[i]);
DBG_Printf("\n");
DBG_Printf("Extensions : %s\n", gl_extensions);
// 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
@@ -353,13 +339,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"))
if (isExtAvailable("WGL_EXT_swap_control",gl_extensions))
wglSwapIntervalEXT = GetGLFunc("wglSwapIntervalEXT");
else
wglSwapIntervalEXT = NULL;
#endif
if (isExtAvailable("GL_EXT_texture_filter_anisotropic"))
if (isExtAvailable("GL_EXT_texture_filter_anisotropic",gl_extensions))
pglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maximumAnisotropy);
else
maximumAnisotropy = 0;
+22 -13
View File
@@ -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,7 +544,6 @@ boolean SetupGLfunc(void)
GETOPENGLFUNC(pglGetFloatv, glGetFloatv)
GETOPENGLFUNC(pglGetIntegerv, glGetIntegerv)
GETOPENGLFUNC(pglGetString, glGetString)
GETOPENGLFUNC(pglGetStringi, glGetStringi)
GETOPENGLFUNC(pglClearDepth, glClearDepth)
GETOPENGLFUNC(pglDepthFunc, glDepthFunc)
@@ -722,7 +721,7 @@ static boolean GLFramebuffer_CheckExt(void)
return false;
// check if all needed gl extensions are available
return (isExtAvailable("GL_ARB_framebuffer_no_attachments") && isExtAvailable("GL_ARB_framebuffer_object") && isExtAvailable("GL_ARB_framebuffer_sRGB"));
return (isExtAvailable("GL_ARB_framebuffer_no_attachments", gl_extensions) && isExtAvailable("GL_ARB_framebuffer_object", gl_extensions) && isExtAvailable("GL_ARB_framebuffer_sRGB", gl_extensions));
}
#endif
@@ -1218,16 +1217,26 @@ void Flush(void)
// isExtAvailable : Look if an OpenGL extension is available
// Returns : true if extension available
// -----------------+
INT32 isExtAvailable(const char *extension)
INT32 isExtAvailable(const char *extension, const GLubyte *start)
{
// Shouldn't really happen
if (gl_extensions == NULL)
GLubyte *where, *terminator;
if (!extension || !start) return 0;
where = (GLubyte *) strchr(extension, ' ');
if (where || *extension == '\0')
return 0;
for (GLuint i = 0; i < gl_num_extensions; ++i)
if (strcmp((const char*)gl_extensions[i], extension) == 0)
return 1;
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;
}
return 0;
}
+2 -5
View File
@@ -70,7 +70,7 @@ void *GetGLFunc(const char *proc);
boolean SetupGLfunc(void);
void SetupGLFunc4(void);
void Flush(void);
INT32 isExtAvailable(const char *extension);
INT32 isExtAvailable(const char *extension, const GLubyte *start);
void SetModelView(GLint w, GLint h);
void SetStates(void);
@@ -90,7 +90,6 @@ 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);
@@ -99,8 +98,6 @@ 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
@@ -121,7 +118,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;
+3 -16
View File
@@ -66,7 +66,6 @@ PFNGLXSWAPINTERVALPROC glXSwapIntervalSGIEXT = NULL;
PFNglClear pglClear;
PFNglGetIntegerv pglGetIntegerv;
PFNglGetString pglGetString;
PFNglGetStringi pglGetStringi;
#endif
#ifdef USE_FBO_OGL
@@ -149,25 +148,13 @@ 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:");
for (GLuint i = 0; i < gl_num_extensions; ++i)
GL_DBG_Printf(" %s", gl_extensions[i]);
GL_DBG_Printf("\n");
GL_DBG_Printf("Extensions: %s\n", gl_extensions);
if (strcmp((const char*)gl_renderer, "GDI Generic") == 0 &&
strcmp((const char*)gl_version, "1.1.0") == 0)
@@ -191,7 +178,7 @@ boolean OglSdlSurface(INT32 w, INT32 h)
else
supportMipMap = true;
if (isExtAvailable("GL_EXT_texture_filter_anisotropic"))
if (isExtAvailable("GL_EXT_texture_filter_anisotropic", gl_extensions))
pglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maximumAnisotropy);
else
maximumAnisotropy = 1;