make this more robust ig

This commit is contained in:
Alug committed 2024-08-20 03:57:49 +02:00
1 parent cf5c0ca5f7
commit 31c64b63de
3 files changed
+14 -16

No files matched your search

+11 -10
View File
@@ -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;
-1
View File
@@ -105,7 +105,6 @@ static PFNglEnableClientState pglEnableClientState;
#endif
#ifdef USE_FBO_OGL
void GLFramebuffer_IsFuncAvailible(void);
void GLFramebuffer_Generate(void);
void GLFramebuffer_Delete(void);
+3 -5
View File
@@ -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);