From a37c81a142be6cf2f83ff499dd008f0589e9bfb8 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 17 Feb 2024 11:13:04 +0100 Subject: [PATCH] Revert "Revert "fix some issues with framebuffer"" This reverts commit 645784763376c7bf885022600811114eb227f47b. --- src/hardware/hw_main.c | 5 ++- src/hardware/r_opengl/r_opengl.c | 73 +++++++++++++++++++++----------- 2 files changed, 53 insertions(+), 25 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index ad894b82f..349161730 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -97,7 +97,7 @@ consvar_t cv_grsolvetjoin = {"gr_solvetjoin", "On", 0, CV_OnOff, NULL, 0, NULL, consvar_t cv_grbatching = {"gr_batching", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_grframebuffer = {"gr_framebuffer", "On", CV_SAVE|CV_CALL, CV_OnOff, CV_grframebuffer_OnChange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_grframebuffer = {"gr_framebuffer", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, CV_grframebuffer_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_grfofcut = {"gr_fofcut", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -170,6 +170,7 @@ static void CV_grframebuffer_OnChange(void) { ONLY_IF_GL_LOADED HWD.pfnSetSpecialState(HWD_SET_FRAMEBUFFER, cv_grframebuffer.value); + OglSdlSurface(vid.width, vid.height); //this is really dumb but it works TODO: fix compiler warning, cant include the proper header file here } static void CV_filtermode_ONChange(void) @@ -6557,6 +6558,8 @@ void HWR_Startup(void) HWR_LoadAllCustomShaders(); HWR_TogglePaletteRendering(); + + HWD.pfnSetSpecialState(HWD_SET_FRAMEBUFFER, cv_grframebuffer.value); if (msaa) { diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 6d3563dcf..cbf3b502e 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -113,11 +113,11 @@ static GLfloat modelMatrix[16]; static GLfloat projMatrix[16]; static GLint viewport[4]; +static boolean gl_framebuffer_init(void); GLuint FramebufferObject, FramebufferTexture, RenderbufferObject; GLboolean FrameBufferEnabled = GL_FALSE, RenderToFramebuffer = GL_FALSE; - // Sryder: NextTexAvail is broken for these because palette changes or changes to the texture filter or antialiasing // flush all of the stored textures, leaving them unavailable at times such as between levels // These need to start at 0 and be set to their number, and be reset to 0 when deleted so that Intel GPUs @@ -324,7 +324,6 @@ static void GL_MSG_Error(const char *format, ...) #define pglRenderbufferStorage glRenderbufferStorage #define pglFramebufferRenderbuffer glFramebufferRenderbuffer - #else //!STATIC_OPENGL /* 1.0 functions */ @@ -442,7 +441,6 @@ typedef void (APIENTRY * PFNglCopyTexImage2D) (GLenum target, GLint level, GLenu static PFNglCopyTexImage2D pglCopyTexImage2D; typedef void (APIENTRY * PFNglCopyTexSubImage2D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); static PFNglCopyTexSubImage2D pglCopyTexSubImage2D; -#endif /* 3.0 functions */ typedef void (APIENTRY * PFNglGenerateMipmap) (GLenum target); @@ -450,25 +448,38 @@ static PFNglGenerateMipmap pglGenerateMipmap; /* 3.0 functions for framebuffers and renderbuffers */ typedef void (APIENTRY * PFNglGenFramebuffers) (GLsizei n, GLuint *ids); -static PFNglGenFramebuffers pglGenFramebuffers; +extern PFNglGenFramebuffers pglGenFramebuffers; typedef void (APIENTRY * PFNglBindFramebuffer) (GLenum target, GLuint framebuffer); -static PFNglBindFramebuffer pglBindFramebuffer; +extern PFNglBindFramebuffer pglBindFramebuffer; typedef void (APIENTRY * PFNglDeleteFramebuffers) (GLsizei n, GLuint *ids); -static PFNglDeleteFramebuffers pglDeleteFramebuffers; +extern PFNglDeleteFramebuffers pglDeleteFramebuffers; typedef void (APIENTRY * PFNglFramebufferTexture2D) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -static PFNglFramebufferTexture2D pglFramebufferTexture2D; +extern PFNglFramebufferTexture2D pglFramebufferTexture2D; typedef GLenum (APIENTRY * PFNglCheckFramebufferStatus) (GLenum target); -static PFNglCheckFramebufferStatus pglCheckFramebufferStatus; +extern PFNglCheckFramebufferStatus pglCheckFramebufferStatus; typedef void (APIENTRY * PFNglGenRenderbuffers) (GLsizei n, GLuint *renderbuffers); -static PFNglGenRenderbuffers pglGenRenderbuffers; +extern PFNglGenRenderbuffers pglGenRenderbuffers; typedef void (APIENTRY * PFNglBindRenderbuffer) (GLenum target, GLuint renderbuffer); -static PFNglBindRenderbuffer pglBindRenderbuffer; +extern PFNglBindRenderbuffer pglBindRenderbuffer; typedef void (APIENTRY * PFNglDeleteRenderbuffers) (GLsizei n, GLuint *renderbuffers); -static PFNglDeleteRenderbuffers pglDeleteRenderbuffers; +extern PFNglDeleteRenderbuffers pglDeleteRenderbuffers; typedef void (APIENTRY * PFNglRenderbufferStorage) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -static PFNglRenderbufferStorage pglRenderbufferStorage; +extern PFNglRenderbufferStorage pglRenderbufferStorage; typedef void (APIENTRY * PFNglFramebufferRenderbuffer) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLenum renderbuffer); -static PFNglFramebufferRenderbuffer pglFramebufferRenderbuffer; +extern PFNglFramebufferRenderbuffer pglFramebufferRenderbuffer; + +/* 3.0 functions for framebuffers and renderbuffers */ +PFNglGenFramebuffers pglGenFramebuffers; +PFNglBindFramebuffer pglBindFramebuffer; +PFNglDeleteFramebuffers pglDeleteFramebuffers; +PFNglFramebufferTexture2D pglFramebufferTexture2D; +PFNglCheckFramebufferStatus pglCheckFramebufferStatus; +PFNglGenRenderbuffers pglGenRenderbuffers; +PFNglBindRenderbuffer pglBindRenderbuffer; +PFNglDeleteRenderbuffers pglDeleteRenderbuffers; +PFNglRenderbufferStorage pglRenderbufferStorage; +PFNglFramebufferRenderbuffer pglFramebufferRenderbuffer; +#endif /* 1.2 functions for 3D textures */ typedef void (APIENTRY * PFNglTexImage3D) (GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); @@ -531,17 +542,6 @@ boolean SetupGLfunc(void) GL_MSG_Warning("failed to get OpenGL function: %s", #proc); \ } \ - GETOPENGLFUNC(pglGenFramebuffers, glGenFramebuffers); - GETOPENGLFUNC(pglBindFramebuffer, glBindFramebuffer); - GETOPENGLFUNC(pglDeleteFramebuffers, glDeleteFramebuffers); - GETOPENGLFUNC(pglFramebufferTexture2D, glFramebufferTexture2D); - GETOPENGLFUNC(pglCheckFramebufferStatus, glCheckFramebufferStatus); - GETOPENGLFUNC(pglGenRenderbuffers, glGenRenderbuffers); - GETOPENGLFUNC(pglBindRenderbuffer, glBindRenderbuffer); - GETOPENGLFUNC(pglDeleteRenderbuffers, glDeleteRenderbuffers); - GETOPENGLFUNC(pglRenderbufferStorage, glRenderbufferStorage); - GETOPENGLFUNC(pglFramebufferRenderbuffer, glFramebufferRenderbuffer); - GETOPENGLFUNC(pglClearColor, glClearColor) GETOPENGLFUNC(pglClear, glClear) @@ -806,6 +806,13 @@ void SetupGLFunc4(void) pglFramebufferRenderbuffer = GetGLFunc("glFramebufferRenderbuffer"); } +static boolean gl_framebuffer_init(void) +{ + return (pglGenFramebuffers && pglBindFramebuffer && pglDeleteFramebuffers && pglFramebufferTexture2D && pglCheckFramebufferStatus && + pglGenRenderbuffers && pglBindRenderbuffer && pglDeleteRenderbuffers && pglRenderbufferStorage && pglFramebufferRenderbuffer); +} + + EXPORT boolean HWRAPI(InitShaders) (void) { #ifdef GL_SHADERS @@ -1048,6 +1055,9 @@ void SetStates(void) void GLFramebuffer_Generate(void) { + if (!gl_framebuffer_init()) + return; + // Generate the framebuffer if (FramebufferObject == 0) pglGenFramebuffers(1, &FramebufferObject); @@ -1058,6 +1068,9 @@ void GLFramebuffer_Generate(void) void GLFramebuffer_Delete(void) { + if (!gl_framebuffer_init()) + return; + // Unbind the framebuffer pglBindFramebuffer(GL_FRAMEBUFFER, 0); @@ -1070,6 +1083,9 @@ void GLFramebuffer_Delete(void) void GLFramebuffer_GenerateAttachments(void) { + if (!gl_framebuffer_init()) + return; + // Bind the framebuffer pglBindFramebuffer(GL_FRAMEBUFFER, FramebufferObject); @@ -1108,6 +1124,9 @@ void GLFramebuffer_GenerateAttachments(void) void GLFramebuffer_DeleteAttachments(void) { + if (!gl_framebuffer_init()) + return; + // Unbind the framebuffer pglBindFramebuffer(GL_FRAMEBUFFER, 0); @@ -1123,6 +1142,9 @@ void GLFramebuffer_DeleteAttachments(void) void GLFramebuffer_Enable(void) { + if (!gl_framebuffer_init()) + return; + if (FramebufferObject == 0) GLFramebuffer_Generate(); else if (FramebufferTexture == 0 || RenderbufferObject == 0) @@ -1134,6 +1156,9 @@ void GLFramebuffer_Enable(void) void GLFramebuffer_Disable(void) { + if (!gl_framebuffer_init()) + return; + pglBindFramebuffer(GL_FRAMEBUFFER, 0); pglBindRenderbuffer(GL_RENDERBUFFER, 0); }