Fix intro menu when only one upscaler is available

vs-shirokii · Aug 11, 2024 · 7055611 · 7055611
1 parent c7d5298
commit 7055611
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/src/common/rendering/rt/rt_cutscene.cpp b/src/common/rendering/rt/rt_cutscene.cpp
@@ -862,23 +862,26 @@ namespace firststart
                 {
                     case ITEM_MODE: {
                         cvar::rt_framegen = false;
-                        if( cvar::rt_upscale_dlss > 0 && cvar::rt_available_dlss2 )
+                        if( cvar::rt_available_dlss2 && cvar::rt_available_fsr2 )
                         {
-                            const int preset      = *cvar::rt_upscale_dlss;
-                            cvar::rt_upscale_dlss = 0;
-                            cvar::rt_upscale_fsr2 = preset;
+                            if( cvar::rt_upscale_dlss > 0 )
+                            {
+                                const int preset      = *cvar::rt_upscale_dlss;
+                                cvar::rt_upscale_dlss = 0;
+                                cvar::rt_upscale_fsr2 = preset;
+                            }
+                            else if( cvar::rt_upscale_fsr2 > 0 )
+                            {
+                                const int preset      = *cvar::rt_upscale_fsr2;
+                                cvar::rt_upscale_dlss = preset;
+                                cvar::rt_upscale_fsr2 = 0;
+                            }
                         }
-                        else if( cvar::rt_upscale_fsr2 > 0 && cvar::rt_available_fsr2 )
+                        else if( !cvar::rt_available_dlss2 && !cvar::rt_available_fsr2 )
                         {
-                            const int preset      = *cvar::rt_upscale_fsr2;
-                            cvar::rt_upscale_dlss = preset;
+                            cvar::rt_upscale_dlss = 0;
                             cvar::rt_upscale_fsr2 = 0;
                         }
-                        else
-                        {
-                            cvar::rt_upscale_dlss = cvar::rt_available_dlss2 ? 2 : 0;
-                            cvar::rt_upscale_fsr2 = cvar::rt_available_dlss2 ? 0 : 2;
-                        }
                         return true;
                     }
                     case ITEM_PRESET: {
@@ -1139,6 +1142,7 @@ namespace firststart
 
         if( state.finished )
         {
+            twod->AddColorOnlyQuad( 0, 0, twod->GetWidth(), twod->GetHeight(), 0xFF000000 );
             return;
         }