From 715096dc2fb7302c9fc259f77d6a758d68b0462f Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 11 Nov 2026 04:35:27 +0100 Subject: [PATCH] further simplify downsample stuff man idk why i even did the whole desktop res shit somehow kept forgetting we should just check against the drawable/window size as it determines the main framebuffer size so we just can use SDL_GetWindowSize and get rid of all the other crap --- src/i_video.h | 1 - src/sdl/i_video.c | 89 +++++++++++++++++------------------------------ src/sdl/ogl_sdl.c | 6 ++-- 3 files changed, 33 insertions(+), 63 deletions(-) diff --git a/src/i_video.h b/src/i_video.h index b48bb3162..608bb2e81 100644 --- a/src/i_video.h +++ b/src/i_video.h @@ -123,7 +123,6 @@ void I_ReadScreen(UINT8 * restrict scr, INT32 scale); UINT32 I_GetRefreshRate(void); boolean I_CheckAboveDesktopRes(INT32 width, INT32 height); -boolean I_CheckNativeRes(void); void I_SetBorderlessWindow(void); diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index 9447da840..4a20b6dbc 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -118,10 +118,6 @@ consvar_t cv_keyboardlayout = {"keyboardlayout", "Default US", CV_SAVE|CV_CALL, static void Impl_SetVsync(void); -static INT32 desktopwidth = 0, desktopheight = 0; - -static void I_CheckDesktopRes(void); - // synchronize page flipping with screen refresh consvar_t cv_vidwait = {"vid_wait", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Impl_SetVsync, 0, NULL, NULL, 0, 0, NULL}; static consvar_t cv_stretch = {"stretch", "Off", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -484,18 +480,12 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt) if (windowmoved) { - I_CheckDesktopRes(); - // if we say moved our game window to a different screen // refetch our resolutions I_FillScreenResolutionsList(false); -#ifdef HWRENDER #ifdef USE_FBO_OGL if (rendermode == render_opengl) - { I_CheckDownSampleState(false); - } -#endif #endif windowmoved = SDL_FALSE; } @@ -1203,9 +1193,7 @@ static void VID_Command_ModeList_f(void) // List windowed modes INT32 i = 0; - CONS_Printf("NOTE: Under SDL2, all modes are supported on all platforms.\n" - "Under opengl, fullscreen only supports native desktop resolution.\n" - "Under software, the mode is stretched up to desktop resolution.\n"); + CONS_Printf("NOTE: Under SDL2, all modes are supported on all platforms.\n"); for (i = 0; i < vid_nummodes; i++) { @@ -1231,44 +1219,6 @@ static void VID_Command_Mode_f (void) setmodeneeded = modenum+1; // request vid mode change } -// Get the desktop resolution from the current display the gamewindow resides on -static void I_CheckDesktopRes(void) -{ - int currentDisplayIndex = -1; - SDL_DisplayMode curmode; - - // just fallback to game res ig? - desktopwidth = vid.width; - desktopheight = vid.height; - - currentDisplayIndex = SDL_GetWindowDisplayIndex(window); - - // No valid index - if (currentDisplayIndex < 0) - { - return; - } - - if (SDL_GetCurrentDisplayMode(currentDisplayIndex, &curmode) < 0) - { - return; - } - - desktopwidth = curmode.w; - desktopheight = curmode.h; -} - -// Check if the game resolution matches the desktop resolution -boolean I_CheckNativeRes(void) -{ - return (vid.width == desktopwidth && vid.height == desktopheight); -} - -boolean I_CheckAboveDesktopRes(INT32 width, INT32 height) -{ - return (width > desktopwidth || height > desktopheight); -} - #ifdef USE_FBO_OGL static boolean vid_downsampling = false; @@ -1287,7 +1237,15 @@ void I_CheckDownSampleState(boolean forcerefresh) } // no sense to do this crap if we cant benefit from it - const boolean newdownsamplestate = cv_glframebuffer.value && (cv_glscreentextures.value == 2) && I_CheckAboveDesktopRes(vid.width, vid.height); + boolean newdownsamplestate = false; + + if (cv_glframebuffer.value && (cv_glscreentextures.value == 2)) + { + int sdlw, sdlh; + SDL_GetWindowSize(window, &sdlw, &sdlh); + if (vid.width > sdlw || vid.height > sdlh) + newdownsamplestate = true; + } // state changed or fbo was toggled if (vid_downsampling != newdownsamplestate || forcerefresh) @@ -1326,8 +1284,8 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen) } // Reposition window only in windowed mode - const int windowpos = SDL_GetWindowDisplayIndex(window); SDL_SetWindowSize(window, width, height); + const int windowpos = SDL_GetWindowDisplayIndex(window); SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED_DISPLAY(windowpos), SDL_WINDOWPOS_CENTERED_DISPLAY(windowpos) @@ -1350,7 +1308,6 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen) #ifdef HWRENDER if (rendermode == render_opengl) { - I_CheckDesktopRes(); #ifdef USE_FBO_OGL I_CheckDownSampleState(false); #endif @@ -1565,6 +1522,13 @@ static int IsCustomResolutionInList(int list_size) return 0; } +static INT32 desktopwidth = 0, desktopheight = 0; + +boolean I_CheckAboveDesktopRes(INT32 width, INT32 height) +{ + return (width > desktopwidth || height > desktopheight); +} + // // I_FillScreenResolutionsList // Get all the supported screen resolutions @@ -1579,19 +1543,26 @@ static void I_FillScreenResolutionsList(boolean force) int count = 0; char custom_resolution[10]; + // just fallback to game res ig? + desktopwidth = vid.width; + desktopheight = vid.height; + currentDisplayIndex = SDL_GetWindowDisplayIndex(window); // No valid index if (currentDisplayIndex < 0) - { return; + + // this is only to mark certain resolutions in red + if (SDL_GetCurrentDisplayMode(currentDisplayIndex, &mode) >= 0) + { + desktopwidth = mode.w; + desktopheight = mode.h; } // didnt change screen, no need to redo the list if (!force && currentDisplayIndex == oldDisplayIndex) - { return; - } oldDisplayIndex = currentDisplayIndex; @@ -1734,7 +1705,7 @@ void VID_PrepareModeList(void) static UINT32 refresh_rate; static UINT32 VID_GetRefreshRate(void) { - int index = SDL_GetWindowDisplayIndex(window); + int index; SDL_DisplayMode m; if (SDL_WasInit(SDL_INIT_VIDEO) == 0) @@ -1743,6 +1714,8 @@ static UINT32 VID_GetRefreshRate(void) return 0; } + index = SDL_GetWindowDisplayIndex(window); + if (SDL_GetDesktopDisplayMode(index, &m) != 0) { // Error has occurred. diff --git a/src/sdl/ogl_sdl.c b/src/sdl/ogl_sdl.c index 83bf7d8af..144c50f8d 100644 --- a/src/sdl/ogl_sdl.c +++ b/src/sdl/ogl_sdl.c @@ -225,7 +225,6 @@ boolean OglSdlSurface(INT32 w, INT32 h) void OglSdlFinishUpdate(SDL_Window *window) { int sdlw, sdlh; - #ifdef USE_FBO_OGL const boolean usefbo = UseScreenFBO(); #endif @@ -262,11 +261,10 @@ void OglSdlFinishUpdate(SDL_Window *window) // Sryder: We need to draw the final screen texture again into the other buffer in the original position so that // effects that want to take the old screen can do so after this - // well we dont need it on native res it seems #ifdef USE_FBO_OGL - if (!usefbo && (!I_CheckNativeRes() || WipeInAction)) + if (!usefbo && (realwidth != sdlw || realheight != sdlh)) // not needed if fbo is in use #else - if (!I_CheckNativeRes() || WipeInAction) + if (realwidth != sdlw || realheight != sdlh) // this is not needed if the render size matches window size #endif HWR_DrawScreenFinalTexture(realwidth, realheight); }