From a197a859300a2e435c40cf13d32f187eefbc7693 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 19 Aug 2024 18:57:16 +0200 Subject: [PATCH] enforce the xwayland hack even if fbo cvar is disabled we have a bunch of guards in it so dont think there will be a problem --- src/i_video.h | 4 ++++ src/sdl/i_video.c | 7 ++++--- src/sdl/ogl_sdl.c | 25 +++++++++++++++++++++++-- src/sdl/ogl_sdl.h | 6 ++++++ 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/i_video.h b/src/i_video.h index 708fde03c..6a60f8036 100644 --- a/src/i_video.h +++ b/src/i_video.h @@ -140,6 +140,10 @@ UINT32 I_GetRefreshRate(void); boolean I_UseNativeKeyboard(void); #ifdef USE_FBO_OGL +#if defined (__unix__) +extern boolean xwaylandcrap; +#endif + void RefreshOGLSDLSurface(void); void I_DownSample(void); extern boolean downsample; diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index ff3469c26..0fd9de075 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -219,6 +219,7 @@ static void Impl_SetWindowIcon(void); #ifdef USE_FBO_OGL #if defined (__unix__) static void I_FixXwaylandNvidia(void); +boolean xwaylandcrap = false; #endif boolean downsample = false; void RefreshOGLSDLSurface(void) @@ -789,14 +790,14 @@ static void I_FixXwaylandNvidia(void) //dumbass crap, fix ur shit nvidia { if (!supportFBO) { - downsample = false; + xwaylandcrap = false; return; } // enable fbo resize shit, update the ogl surface and turn crap back off lol - downsample = true; + xwaylandcrap = true; RefreshOGLSDLSurface(); - downsample = false; + xwaylandcrap = false; RefreshOGLSDLSurface(); } #endif diff --git a/src/sdl/ogl_sdl.c b/src/sdl/ogl_sdl.c index ba40f1612..ea97b9370 100644 --- a/src/sdl/ogl_sdl.c +++ b/src/sdl/ogl_sdl.c @@ -68,6 +68,12 @@ PFNglGetIntegerv pglGetIntegerv; PFNglGetString pglGetString; #endif +#if defined (__unix__) +#ifdef USE_FBO_OGL +boolean isnvidiagpu = false; +#endif +#endif + /** \brief SDL video display surface */ INT32 oglflags = 0; @@ -166,6 +172,13 @@ boolean OglSdlSurface(INT32 w, INT32 h) maximumAnisotropy = 1; granisotropicmode_cons_t[1].value = maximumAnisotropy; + +#if defined (__unix__) +#ifdef USE_FBO_OGL + if (strstr((const char*)gl_renderer, "NVIDIA")) + isnvidiagpu = true; +#endif +#endif } first_init = true; @@ -199,7 +212,11 @@ boolean OglSdlSurface(INT32 w, INT32 h) RenderToFramebuffer = FrameBufferEnabled; GLFramebuffer_Disable(); - if (RenderToFramebuffer && downsample) + if ((RenderToFramebuffer && downsample) +#if defined (__unix__) + || (isnvidiagpu && xwaylandcrap) +#endif + ) GLFramebuffer_Enable(); #endif @@ -245,7 +262,11 @@ void OglSdlFinishUpdate(boolean waitvbl) HWR_DrawScreenFinalTexture(sdlw, sdlh); #ifdef USE_FBO_OGL - if (RenderToFramebuffer && downsample) + if ((RenderToFramebuffer && downsample) +#if defined (__unix__) + || (isnvidiagpu && xwaylandcrap) +#endif + ) GLFramebuffer_Enable(); #endif diff --git a/src/sdl/ogl_sdl.h b/src/sdl/ogl_sdl.h index ad153da93..d45420e37 100644 --- a/src/sdl/ogl_sdl.h +++ b/src/sdl/ogl_sdl.h @@ -20,6 +20,12 @@ boolean OglSdlSurface(INT32 w, INT32 h); +#if defined (__unix__) +#ifdef USE_FBO_OGL +extern boolean isnvidiagpu; +#endif +#endif + void OglSdlFinishUpdate(boolean vidwait); extern SDL_Renderer *renderer;