From 31c64b63de65fbfe1d9202d6ae22561ba42889c7 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 20 Aug 2024 03:57:43 +0200 Subject: [PATCH] make this more robust ig --- src/hardware/r_opengl/r_opengl.c | 21 +++++++++++---------- src/hardware/r_opengl/r_opengl.h | 1 - src/sdl/ogl_sdl.c | 8 +++----- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 3298a04c5..573a52c24 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -705,6 +705,7 @@ static void Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAF static GLRGBAFloat shader_defaultcolor = {1.0f, 1.0f, 1.0f, 1.0f}; +static boolean GLFramebuffer_IsFuncAvailible(void); void SetupGLFunc4(void) { @@ -750,7 +751,7 @@ void SetupGLFunc4(void) pglGetUniformLocation = GetGLFunc("glGetUniformLocation"); #ifdef USE_FBO_OGL - if (supportFBO) + if (GLFramebuffer_IsFuncAvailible()) { pglGenFramebuffers = GetGLFunc("glGenFramebuffers"); pglBindFramebuffer = GetGLFunc("glBindFramebuffer"); @@ -762,22 +763,22 @@ void SetupGLFunc4(void) pglDeleteRenderbuffers = GetGLFunc("glDeleteRenderbuffers"); pglRenderbufferStorage = GetGLFunc("glRenderbufferStorage"); pglFramebufferRenderbuffer = GetGLFunc("glFramebufferRenderbuffer"); + + supportFBO = true; } #endif } #ifdef USE_FBO_OGL -void GLFramebuffer_IsFuncAvailible(void) +static boolean GLFramebuffer_IsFuncAvailible(void) { //this stuff needs atleast OGL 3.0 if (majorGL < 3) - { - supportFBO = false; - return; - } + 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; + 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; } #endif @@ -1128,7 +1129,7 @@ void GLFramebuffer_DeleteAttachments(void) RenderbufferObject = 0; } -void GLFramebuffer_Enable(void) +inline void GLFramebuffer_Enable(void) { if (!supportFBO) return; @@ -1142,7 +1143,7 @@ void GLFramebuffer_Enable(void) pglBindRenderbuffer(GL_RENDERBUFFER, RenderbufferObject); } -void GLFramebuffer_Disable(void) +inline void GLFramebuffer_Disable(void) { if (!supportFBO) return; diff --git a/src/hardware/r_opengl/r_opengl.h b/src/hardware/r_opengl/r_opengl.h index 29759b0a9..255969d5a 100644 --- a/src/hardware/r_opengl/r_opengl.h +++ b/src/hardware/r_opengl/r_opengl.h @@ -105,7 +105,6 @@ 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 a4d401248..13751da83 100644 --- a/src/sdl/ogl_sdl.c +++ b/src/sdl/ogl_sdl.c @@ -157,8 +157,6 @@ boolean OglSdlSurface(INT32 w, INT32 h) "- GPU drivers are missing or broken. You may need to update your drivers."); } - GLFramebuffer_IsFuncAvailible(); - SetupGLInfo(); SetupGLFunc4(); @@ -203,10 +201,10 @@ boolean OglSdlSurface(INT32 w, INT32 h) pglClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT); #ifdef USE_FBO_OGL - RenderToFramebuffer = FrameBufferEnabled; + RenderToFramebuffer = (FrameBufferEnabled && supportFBO && downsample); GLFramebuffer_Disable(); - if ((RenderToFramebuffer && downsample) + if (RenderToFramebuffer #if defined (__unix__) || (isnvidiagpu && xwaylandcrap) #endif @@ -242,7 +240,7 @@ void OglSdlFinishUpdate(boolean waitvbl) #ifdef USE_FBO_OGL GLFramebuffer_Disable(); - RenderToFramebuffer = FrameBufferEnabled; + RenderToFramebuffer = (FrameBufferEnabled && supportFBO && downsample); #endif HWR_DrawScreenFinalTexture(sdlw, sdlh);