PostProcessing: Set unscaled input based on first enabled shader

Only way to get correct sizing when combining reshade and slang.

Author: stenzek

src/util/postprocessing.cpp

@@ -472,6 +472,7 @@ void PostProcessing::Chain::LoadStages(std::unique_lock<std::mutex>& settings_lo
   progress.SetProgressRange(stage_count);
 
   u32 enabled_stage_count = 0;
+  u32 first_enabled_stage = std::numeric_limits<u32>::max();
   u32 last_enabled_stage = std::numeric_limits<u32>::max();
   for (u32 i = 0; i < stage_count; i++)
   {
@@ -503,7 +504,10 @@ void PostProcessing::Chain::LoadStages(std::unique_lock<std::mutex>& settings_lo
     shader->SetFinalStage(false);
     enabled_stage_count += BoolToUInt32(stage_enabled);
     if (stage_enabled)
+    {
+      first_enabled_stage = std::min(first_enabled_stage, i);
       last_enabled_stage = i;
+    }
 
     m_stages.push_back(std::move(shader));
   }
@@ -532,14 +536,16 @@ void PostProcessing::Chain::LoadStages(std::unique_lock<std::mutex>& settings_lo
 
   // must be down here, because we need to compile first, triggered by CheckTargets()
   for (std::unique_ptr<Shader>& shader : m_stages)
-  {
     m_wants_depth_buffer |= (shader->IsEnabled() && shader->WantsDepthBuffer());
-    m_wants_unscaled_input |= (shader->IsEnabled() && shader->WantsUnscaledInput());
-  }
   m_needs_depth_buffer = m_enabled && m_wants_depth_buffer;
   if (m_wants_depth_buffer)
     DEV_COLOR_LOG(StrongOrange, "Depth buffer is needed.");
 
+  m_wants_unscaled_input =
+    (first_enabled_stage < m_stages.size() && m_stages[first_enabled_stage]->WantsUnscaledInput());
+  if (m_wants_unscaled_input)
+    DEV_COLOR_LOG(StrongOrange, "Shader chain wants unscaled input.");
+
   // can't close/redraw with settings lock held because big picture
   settings_lock.unlock();
   progress.Close();
@@ -572,6 +578,7 @@ void PostProcessing::Chain::UpdateSettings(std::unique_lock<std::mutex>& setting
   const u32 prev_enabled_stage_count = static_cast<u32>(std::ranges::count_if(
     m_stages, [](const std::unique_ptr<Shader>& shader) { return (shader && shader->IsEnabled()); }));
   u32 enabled_stage_count = 0;
+  u32 first_enabled_stage = std::numeric_limits<u32>::max();
   u32 last_enabled_stage = 0;
   for (u32 i = 0; i < stage_count; i++)
   {
@@ -615,7 +622,10 @@ void PostProcessing::Chain::UpdateSettings(std::unique_lock<std::mutex>& setting
     m_stages[i]->SetFinalStage(false);
     enabled_stage_count += BoolToUInt32(stage_enabled);
     if (stage_enabled)
+    {
+      first_enabled_stage = std::min(first_enabled_stage, i);
       last_enabled_stage = i;
+    }
   }
 
   if (prev_format != GPUTextureFormat::Unknown)
@@ -647,15 +657,16 @@ void PostProcessing::Chain::UpdateSettings(std::unique_lock<std::mutex>& setting
 
   // must be down here, because we need to compile first, triggered by CheckTargets()
   for (std::unique_ptr<Shader>& shader : m_stages)
-  {
     m_wants_depth_buffer |= (shader->IsEnabled() && shader->WantsDepthBuffer());
-    m_wants_unscaled_input |= (shader->IsEnabled() && shader->WantsUnscaledInput());
-  }
-
   m_needs_depth_buffer = m_enabled && m_wants_depth_buffer;
   if (m_wants_depth_buffer)
     DEV_LOG("Depth buffer is needed.");
 
+  m_wants_unscaled_input =
+    (first_enabled_stage < m_stages.size() && m_stages[first_enabled_stage]->WantsUnscaledInput());
+  if (m_wants_unscaled_input)
+    DEV_COLOR_LOG(StrongOrange, "Shader chain wants unscaled input.");
+
   // can't close/redraw with settings lock held because big picture
   settings_lock.unlock();
   progress.Close();
@@ -727,6 +738,9 @@ bool PostProcessing::Chain::CheckTargets(u32 source_width, u32 source_height, GP
   m_viewport_height = viewport_height;
 
   // shortcut if only the source size changed
+  u32 first_enabled_stage = std::numeric_limits<u32>::max();
+  m_wants_depth_buffer = false;
+  m_wants_unscaled_input = false;
   if (m_target_width != target_width || m_target_height != target_height || m_target_format != target_format)
   {
     if (!progress)
@@ -735,9 +749,6 @@ bool PostProcessing::Chain::CheckTargets(u32 source_width, u32 source_height, GP
     progress->SetProgressRange(static_cast<u32>(m_stages.size()));
     progress->SetProgressValue(0);
 
-    m_wants_depth_buffer = false;
-    m_wants_unscaled_input = false;
-
     for (size_t i = 0; i < m_stages.size(); i++)
     {
       Shader* const shader = m_stages[i].get();
@@ -764,8 +775,8 @@ bool PostProcessing::Chain::CheckTargets(u32 source_width, u32 source_height, GP
       if (!shader->IsEnabled())
         continue;
 
+      first_enabled_stage = std::min(first_enabled_stage, static_cast<u32>(i));
       m_wants_depth_buffer |= shader->WantsDepthBuffer();
-      m_wants_unscaled_input |= shader->WantsUnscaledInput();
 
       // First shader outputs at target size, so the input is now target size.
       source_width = target_width;
@@ -778,8 +789,10 @@ bool PostProcessing::Chain::CheckTargets(u32 source_width, u32 source_height, GP
   {
     m_wants_depth_buffer = false;
 
-    for (std::unique_ptr<Shader>& shader : m_stages)
+    for (size_t i = 0; i < m_stages.size(); i++)
     {
+      const std::unique_ptr<Shader>& shader = m_stages[i];
+
       // Don't allocate targets until first enabled shader.
       if (!shader->IsEnabled())
         continue;
@@ -798,7 +811,8 @@ bool PostProcessing::Chain::CheckTargets(u32 source_width, u32 source_height, GP
         return false;
       }
 
-      m_wants_depth_buffer |= shader->IsEnabled() && shader->WantsDepthBuffer();
+      first_enabled_stage = std::min(first_enabled_stage, static_cast<u32>(i));
+      m_wants_depth_buffer |= shader->WantsDepthBuffer();
 
       // First shader outputs at target size, so the input is now target size.
       source_width = target_width;
@@ -808,6 +822,9 @@ bool PostProcessing::Chain::CheckTargets(u32 source_width, u32 source_height, GP
     }
   }
 
+  m_wants_unscaled_input =
+    (first_enabled_stage < m_stages.size() && m_stages[first_enabled_stage]->WantsUnscaledInput());
+
   m_target_width = target_width;
   m_target_height = target_height;
   m_target_format = target_format;