From 707cd5c5c602a5d128739febb209576bf50d4b34 Mon Sep 17 00:00:00 2001
From: Roman Fomin <rfomin@gmail.com>
Date: Sat, 14 Sep 2024 13:03:21 +0700
Subject: [PATCH] Revert "don't use SDL_RenderSetLogicalSize (#1847)" (#1906)

This reverts commit 8a8a47c29ef7d9a3c1f03fc8daaf0bbd7b05544a.
---
 src/i_video.c | 64 ++++-----------------------------------------------
 1 file changed, 5 insertions(+), 59 deletions(-)

diff --git a/src/i_video.c b/src/i_video.c
index 5c00e456..6b45515b 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -265,9 +265,6 @@ static void FocusLost(void)
 #define FocusLost()
 #endif
 
-static boolean letterboxed;
-static void UpdateViewport(void);
-
 // [FG] window event handling from Chocolate Doom 3.0
 
 static void HandleWindowEvent(SDL_WindowEvent *event)
@@ -317,7 +314,6 @@ static void HandleWindowEvent(SDL_WindowEvent *event)
                 SDL_GetWindowPosition(screen, &window_x, &window_y);
             }
             window_resize = true;
-            UpdateViewport();
             break;
 
         case SDL_WINDOWEVENT_MOVED:
@@ -418,8 +414,6 @@ static void I_ToggleFullScreen(void)
         SDL_SetWindowResizable(screen, SDL_TRUE);
         SDL_SetWindowSize(screen, window_width, window_height);
     }
-
-    UpdateViewport();
 }
 
 static void I_ToggleExclusiveFullScreen(void)
@@ -673,10 +667,7 @@ static void UpdateRender(void)
 
     SDL_UnlockTexture(texture);
 
-    if (letterboxed)
-    {
-        SDL_RenderClear(renderer);
-    }
+    SDL_RenderClear(renderer);
 
     if (texture_upscaled)
     {
@@ -1405,60 +1396,15 @@ static void CreateUpscaledTexture(boolean force)
     SDL_SetTextureScaleMode(texture_upscaled, SDL_ScaleModeLinear);
 }
 
-static void UpdateViewport(void)
-{
-    int w, h;
-    SDL_GetRendererOutputSize(renderer, &w, &h);
-
-    double real_aspect = (double)w / h;
-    double want_aspect = CurrentAspectRatio();
-
-    // Clear the scale because we're setting viewport in output coordinates
-    SDL_RenderSetScale(renderer, 1.0f, 1.0f);
-
-    SDL_Rect viewport = {0};
-
-    if (fabs(want_aspect - real_aspect) < 0.0001)
-    {
-        float scalex = (float)w / video.width;
-        float scaley = (float)h / actualheight;
-        viewport.w = w;
-        viewport.h = h;
-        SDL_RenderSetViewport(renderer, &viewport);
-        SDL_RenderSetScale(renderer, scalex, scaley);
-        letterboxed = false;
-        return;
-    }
-
-    float scale;
-
-    letterboxed = true;
-
-    if (want_aspect > real_aspect)
-    {
-        scale = (float)w / video.width;
-        viewport.w = w;
-        viewport.h = (int)floor(actualheight * scale);
-        viewport.y = (h - viewport.h) / 2;
-    }
-    else
-    {
-        scale = (float)h / actualheight;
-        viewport.h = h;
-        viewport.w = (int)floor(video.width * scale);
-        viewport.x = (w - viewport.w) / 2;
-    }
-
-    SDL_RenderSetViewport(renderer, &viewport);
-    SDL_RenderSetScale(renderer, scale, scale);
-}
-
 static void ResetLogicalSize(void)
 {
     blit_rect.w = video.width;
     blit_rect.h = video.height;
 
-    UpdateViewport();
+    if (SDL_RenderSetLogicalSize(renderer, video.width, actualheight))
+    {
+        I_Printf(VB_ERROR, "Failed to set logical size: %s", SDL_GetError());
+    }
 
     if (smooth_scaling)
     {