From 188f5c7c3cf114c578f46f83bbab8e1ac8f97582 Mon Sep 17 00:00:00 2001
From: kd-11 <karokidii@gmail.com>
Date: Sun, 25 Feb 2024 14:34:27 +0300
Subject: [PATCH] gl: FSR1 cleanup, making it functional

---
 rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp | 29 +++++++++++++++++---
 rpcs3/Emu/RSX/GL/upscalers/fsr_pass.h        |  4 ++-
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp b/rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp
index 56ba6a11e3..7202de6dbe 100644
--- a/rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp
+++ b/rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp
@@ -61,22 +61,32 @@ namespace gl
 			m_constants_buf.resize(utils::rounded_div(push_constants_size, 4), 0);
 
 			create();
+
+			m_sampler.create();
+			m_sampler.apply_defaults(GL_LINEAR);
 		}
 
 		fsr_pass::~fsr_pass()
 		{
 			m_ubo.remove();
+			m_sampler.remove();
 		}
 
 		void fsr_pass::bind_resources()
 		{
 			// Bind relevant stuff
+			const u32 push_buffer_size = ::size32(m_constants_buf) * sizeof(m_constants_buf[0]);
+
 			if (!m_ubo)
 			{
-				m_ubo.create(gl::buffer::target::uniform, 32, nullptr, gl::buffer::memory_type::host_visible);
+				ensure(compiled);
+				m_ubo.create(gl::buffer::target::uniform, push_buffer_size, nullptr, gl::buffer::memory_type::local, GL_DYNAMIC_COPY);
+
+				// Statically bind the image sources
+				m_program.uniforms["InputTexture"] = GL_TEMP_IMAGE_SLOT(0);
+				m_program.uniforms["OutputTexture"] = GL_COMPUTE_IMAGE_SLOT(0);
 			}
 
-			const auto push_buffer_size = m_constants_buf.size() * sizeof(m_constants_buf[0]);
 			m_ubo.sub_data(0, push_buffer_size, m_constants_buf.data());
 			m_ubo.bind_range(GL_COMPUTE_BUFFER_SLOT(0), 0, push_buffer_size);
 		}
@@ -90,6 +100,11 @@ namespace gl
 
 			configure(cmd);
 
+			saved_sampler_state saved(GL_TEMP_IMAGE_SLOT(0), m_sampler);
+			cmd->bind_texture(GL_TEMP_IMAGE_SLOT(0), GL_TEXTURE_2D, src->id());
+
+			glBindImageTexture(GL_COMPUTE_IMAGE_SLOT(0), dst->id(), 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_RGBA8);
+
 			constexpr auto wg_size = 16;
 			const auto invocations_x = utils::aligned_div(output_size.width, wg_size);
 			const auto invocations_y = utils::aligned_div(output_size.height, wg_size);
@@ -193,6 +208,7 @@ namespace gl
 		output_size.height = dst_region.height();
 
 		auto src_image = src;
+		auto input_region = src_region;
 
 		if (input_size.width < output_size.width && input_size.height < output_size.height)
 		{
@@ -220,6 +236,11 @@ namespace gl
 
 				// Swap input for FSR target
 				src_image = m_output_data.get();
+
+				input_region.x1 = 0;
+				input_region.x2 = src_image->width();
+				input_region.y1 = 0;
+				input_region.y2 = src_image->height();
 			}
 		}
 
@@ -227,10 +248,10 @@ namespace gl
 		{
 			m_flip_fbo.recreate();
 			m_flip_fbo.bind();
-			m_flip_fbo.color = src->id();
+			m_flip_fbo.color = src_image->id();
 			m_flip_fbo.read_buffer(m_flip_fbo.color);
 			m_flip_fbo.draw_buffer(m_flip_fbo.color);
-			m_flip_fbo.blit(gl::screen, src_region, dst_region, gl::buffers::color, gl::filter::linear);
+			m_flip_fbo.blit(gl::screen, input_region, dst_region, gl::buffers::color, gl::filter::linear);
 			return 0;
 		}
 
diff --git a/rpcs3/Emu/RSX/GL/upscalers/fsr_pass.h b/rpcs3/Emu/RSX/GL/upscalers/fsr_pass.h
index 869b2b1493..d12dbd10d1 100644
--- a/rpcs3/Emu/RSX/GL/upscalers/fsr_pass.h
+++ b/rpcs3/Emu/RSX/GL/upscalers/fsr_pass.h
@@ -15,10 +15,12 @@ namespace gl
 		protected:
 			gl::texture* m_input_image = nullptr;
 			gl::texture* m_output_image = nullptr;
-			gl::buffer m_ubo;
 			size2u m_input_size;
 			size2u m_output_size;
+
 			std::vector<u32> m_constants_buf;
+			gl::sampler_state m_sampler;
+			gl::buffer m_ubo;
 
 			void bind_resources() override;
 			virtual void configure(const gl::command_context& cmd) = 0;