From 80cd5ea6b41e538f2605408a3a85de82b8d2340a Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 19 Aug 2024 21:48:34 +0200 Subject: [PATCH] do not constantly query ogl extensions --- src/hardware/r_opengl/r_opengl.c | 28 +++++++++++----------------- src/hardware/r_opengl/r_opengl.h | 1 + src/sdl/ogl_sdl.c | 2 ++ 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index a7ebc9180..1d88630d7 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -120,8 +120,6 @@ GLfloat projMatrix[16]; static GLint viewport[4]; #ifdef USE_FBO_OGL -static boolean GLFramebuffer_IsFuncAvailible(void); - GLuint FramebufferObject, FramebufferTexture, RenderbufferObject; GLboolean FrameBufferEnabled = GL_FALSE, RenderToFramebuffer = GL_FALSE; @@ -752,7 +750,7 @@ void SetupGLFunc4(void) pglGetUniformLocation = GetGLFunc("glGetUniformLocation"); #ifdef USE_FBO_OGL - if (GLFramebuffer_IsFuncAvailible()) + if (supportFBO) { pglGenFramebuffers = GetGLFunc("glGenFramebuffers"); pglBindFramebuffer = GetGLFunc("glBindFramebuffer"); @@ -769,17 +767,14 @@ void SetupGLFunc4(void) } #ifdef USE_FBO_OGL -static boolean GLFramebuffer_IsFuncAvailible(void) +void GLFramebuffer_IsFuncAvailible(void) { //this stuff needs atleast OGL 3.0 if (majorGL < 3) - return false; + supportFBO = false; - return((isExtAvailable("GL_ARB_framebuffer_no_attachments",gl_extensions)) && - (isExtAvailable("GL_ARB_framebuffer_object",gl_extensions)) && - (isExtAvailable("GL_ARB_framebuffer_sRGB",gl_extensions))); - - return false; + if (isExtAvailable("GL_ARB_framebuffer_no_attachments",gl_extensions) && isExtAvailable("GL_ARB_framebuffer_object",gl_extensions) && isExtAvailable("GL_ARB_framebuffer_sRGB",gl_extensions)) + supportFBO = true; } #endif @@ -1012,7 +1007,7 @@ void SetStates(void) #ifdef USE_FBO_OGL void GLFramebuffer_Generate(void) { - if (!GLFramebuffer_IsFuncAvailible()) + if (!supportFBO) return; // Generate the framebuffer @@ -1025,7 +1020,7 @@ void GLFramebuffer_Generate(void) void GLFramebuffer_Delete(void) { - if (!GLFramebuffer_IsFuncAvailible()) + if (!supportFBO) return; // Unbind the framebuffer @@ -1040,7 +1035,7 @@ void GLFramebuffer_Delete(void) void GLFramebuffer_GenerateAttachments(void) { - if (!GLFramebuffer_IsFuncAvailible()) + if (!supportFBO) return; // Bind the framebuffer @@ -1081,7 +1076,7 @@ void GLFramebuffer_GenerateAttachments(void) void GLFramebuffer_DeleteAttachments(void) { - if (!GLFramebuffer_IsFuncAvailible()) + if (!supportFBO) return; // Unbind the framebuffer @@ -1099,7 +1094,7 @@ void GLFramebuffer_DeleteAttachments(void) void GLFramebuffer_Enable(void) { - if (!GLFramebuffer_IsFuncAvailible()) + if (!supportFBO) return; if (FramebufferObject == 0) @@ -1113,7 +1108,7 @@ void GLFramebuffer_Enable(void) void GLFramebuffer_Disable(void) { - if (!GLFramebuffer_IsFuncAvailible()) + if (!supportFBO) return; pglBindFramebuffer(GL_FRAMEBUFFER, 0); @@ -2344,7 +2339,6 @@ EXPORT void HWRAPI(SetSpecialState) (hwdspecialstate_t IdState, INT32 Value) #ifdef USE_FBO_OGL case HWD_SET_FRAMEBUFFER: FrameBufferEnabled = Value ? GL_TRUE : GL_FALSE; - supportFBO = GLFramebuffer_IsFuncAvailible(); if (!supportFBO) { diff --git a/src/hardware/r_opengl/r_opengl.h b/src/hardware/r_opengl/r_opengl.h index 255969d5a..29759b0a9 100644 --- a/src/hardware/r_opengl/r_opengl.h +++ b/src/hardware/r_opengl/r_opengl.h @@ -105,6 +105,7 @@ static PFNglEnableClientState pglEnableClientState; #endif #ifdef USE_FBO_OGL +void GLFramebuffer_IsFuncAvailible(void); void GLFramebuffer_Generate(void); void GLFramebuffer_Delete(void); diff --git a/src/sdl/ogl_sdl.c b/src/sdl/ogl_sdl.c index ea97b9370..67a88df14 100644 --- a/src/sdl/ogl_sdl.c +++ b/src/sdl/ogl_sdl.c @@ -157,6 +157,8 @@ boolean OglSdlSurface(INT32 w, INT32 h) "- GPU drivers are missing or broken. You may need to update your drivers."); } + GLFramebuffer_IsFuncAvailible(); + SetupGLInfo(); SetupGLFunc4();