From cfeb161c7ebf93bf6ac39e430fc998dc13abfc66 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sat, 31 Jul 2021 03:04:08 -0300
Subject: glsl/glasm: Pass and use scaling parameters in shaders

---
 .../renderer_opengl/gl_graphics_pipeline.cpp       | 36 ++++++++++++++--------
 1 file changed, 23 insertions(+), 13 deletions(-)

(limited to 'src/video_core/renderer_opengl/gl_graphics_pipeline.cpp')

diff --git a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp
index 92fda9af0..01aa2897a 100644
--- a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp
+++ b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp
@@ -444,23 +444,11 @@ void GraphicsPipeline::ConfigureImpl(bool is_indexed) {
         WaitForBuild();
     }
     const bool use_assembly{assembly_programs[0].handle != 0};
-    const bool is_rescaling{texture_cache.IsRescaling()};
-    const f32 config_down_factor{Settings::values.resolution_info.down_factor};
-    const f32 down_factor{is_rescaling ? config_down_factor : 1.0f};
     if (use_assembly) {
         program_manager.BindAssemblyPrograms(assembly_programs, enabled_stages_mask);
     } else {
         program_manager.BindSourcePrograms(source_programs);
     }
-    for (size_t stage = 0; stage < source_programs.size(); ++stage) {
-        if (stage_infos[stage].uses_rescaling_uniform) {
-            if (use_assembly) {
-                glProgramEnvParameter4fARB(AssemblyStage(stage), 0, down_factor, 0.0f, 0.0f, 1.0f);
-            } else {
-                glProgramUniform1f(source_programs[stage].handle, 0, down_factor);
-            }
-        }
-    }
     const VideoCommon::ImageViewInOut* views_it{views.data()};
     GLsizei texture_binding = 0;
     GLsizei image_binding = 0;
@@ -476,11 +464,20 @@ void GraphicsPipeline::ConfigureImpl(bool is_indexed) {
         views_it += num_texture_buffers[stage];
         views_it += num_image_buffers[stage];
 
+        u32 scaling_mask{};
+        u32 stage_texture_binding{};
+
         const auto& info{stage_infos[stage]};
         for (const auto& desc : info.texture_descriptors) {
             for (u32 index = 0; index < desc.count; ++index) {
                 ImageView& image_view{texture_cache.GetImageView((views_it++)->id)};
-                textures[texture_binding++] = image_view.Handle(desc.type);
+                textures[texture_binding] = image_view.Handle(desc.type);
+                if (True(texture_cache.GetImage(image_view.image_id).flags &
+                         VideoCommon::ImageFlagBits::Rescaled)) {
+                    scaling_mask |= 1u << stage_texture_binding;
+                }
+                ++texture_binding;
+                ++stage_texture_binding;
             }
         }
         for (const auto& desc : info.image_descriptors) {
@@ -492,6 +489,19 @@ void GraphicsPipeline::ConfigureImpl(bool is_indexed) {
                 images[image_binding++] = image_view.StorageView(desc.type, desc.format);
             }
         }
+        if (info.uses_rescaling_uniform) {
+            const f32 float_scaling_mask{Common::BitCast<f32>(scaling_mask)};
+            const bool is_rescaling{texture_cache.IsRescaling()};
+            const f32 config_down_factor{Settings::values.resolution_info.down_factor};
+            const f32 down_factor{is_rescaling ? config_down_factor : 1.0f};
+            if (use_assembly) {
+                glProgramLocalParameter4fARB(AssemblyStage(stage), 0, float_scaling_mask,
+                                             down_factor, 0.0f, 0.0f);
+            } else {
+                glProgramUniform4f(source_programs[stage].handle, 0, float_scaling_mask,
+                                   down_factor, 0.0f, 0.0f);
+            }
+        }
     }};
     if constexpr (Spec::enabled_stages[0]) {
         prepare_stage(0);
-- 
cgit v1.2.3