extra stuffs

src/video_core/CMakeLists.txt

@@ -181,6 +181,8 @@ add_library(video_core STATIC
     renderer_vulkan/present/present_push_constants.h
     renderer_vulkan/present/smaa.cpp
     renderer_vulkan/present/smaa.h
+    renderer_vulkan/present/sgsr.cpp
+    renderer_vulkan/present/sgsr.h
     renderer_vulkan/present/util.cpp
     renderer_vulkan/present/util.h
     renderer_vulkan/present/window_adapt_pass.cpp

src/video_core/host_shaders/CMakeLists.txt

@@ -76,8 +76,11 @@ set(SHADER_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/vulkan_quad_indexed.comp
     ${CMAKE_CURRENT_SOURCE_DIR}/vulkan_turbo_mode.comp
     ${CMAKE_CURRENT_SOURCE_DIR}/vulkan_uint8.comp
-    ${SNAPDRAGON_GSR_INCLUDE_DIR}/sgsr1_shader_mobile.frag
-    ${SNAPDRAGON_GSR_INCLUDE_DIR}/sgsr1_shader_mobile_edge_direction.frag
+
+    # Snapdragon Game Super Resolution
+    ${CMAKE_CURRENT_SOURCE_DIR}/sgsr1_shader.vert
+    ${snapdragon_gsr_SOURCE_DIR}/sgsr/v1/include/glsl/sgsr1_shader_mobile.frag
+    ${snapdragon_gsr_SOURCE_DIR}/sgsr/v1/include/glsl/sgsr1_shader_mobile_edge_direction.frag
 )
 
 if (PLATFORM_HAIKU)

src/video_core/renderer_vulkan/present/layer.cpp

@@ -15,6 +15,7 @@
 #include "common/settings.h"
 #include "video_core/framebuffer_config.h"
 #include "video_core/renderer_vulkan/present/fsr.h"
+#include "video_core/renderer_vulkan/present/sgsr.h"
 #include "video_core/renderer_vulkan/present/fxaa.h"
 #include "video_core/renderer_vulkan/present/layer.h"
 #include "video_core/renderer_vulkan/present/present_push_constants.h"

src/video_core/renderer_vulkan/present/sgsr.cpp

@@ -5,18 +5,17 @@
 #include "common/div_ceil.h"
 #include "common/settings.h"
 
-#include "video_core/fsr.h"
+//#include "video_core/sgsr.h"
 #include "video_core/host_shaders/sgsr1_shader_mobile_frag_spv.h"
 #include "video_core/host_shaders/sgsr1_shader_mobile_edge_direction_frag_spv.h"
 #include "video_core/host_shaders/sgsr1_shader_vert_spv.h"
-#include "video_core/renderer_vulkan/present/fsr.h"
+#include "video_core/renderer_vulkan/present/sgsr.h"
 #include "video_core/renderer_vulkan/present/util.h"
 #include "video_core/renderer_vulkan/vk_scheduler.h"
 #include "video_core/renderer_vulkan/vk_shader_util.h"
 #include "video_core/vulkan_common/vulkan_device.h"
 
 namespace Vulkan {
-using namespace SGSR;
 
 using PushConstants = std::array<u32, 4 * 4>;
 
@@ -46,7 +45,7 @@ SGSR::SGSR(const Device& device, MemoryAllocator& memory_allocator, size_t image
     m_descriptor_pool = CreateWrappedDescriptorPool(m_device, 2 * m_image_count, 2 * m_image_count);
     m_descriptor_set_layout = CreateWrappedDescriptorSetLayout(m_device, {VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER});
 
-    std::vector<VkDescriptorSetLayout> layouts(MaxSgsrStage, *m_descriptor_set_layout);
+    std::vector<VkDescriptorSetLayout> layouts(SGSR_STAGE_COUNT, *m_descriptor_set_layout);
     for (auto& images : m_dynamic_images)
         images.descriptor_sets = CreateWrappedDescriptorSets(m_descriptor_pool, layouts);
 
@@ -123,11 +122,11 @@ VkImageView SGSR::Draw(Scheduler& scheduler, size_t image_index, VkImage source_
     UpdateDescriptorSets(source_image_view, image_index);
 
     scheduler.RequestOutsideRenderPassOperationContext();
-    scheduler.Record([=](vk::CommandBuffer cmdbuf) {
+    scheduler.Record([=, this](vk::CommandBuffer cmdbuf) {
         TransitionImageLayout(cmdbuf, source_image, VK_IMAGE_LAYOUT_GENERAL);
         TransitionImageLayout(cmdbuf, stage0_image, VK_IMAGE_LAYOUT_GENERAL);
         BeginRenderPass(cmdbuf, renderpass, stage0_framebuffer, extent);
-        cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, m_stage_pipeline[0]);
+        cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, *m_stage_pipeline[0]);
         cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline_layout, 0, stage0_descriptor_set, {});
         cmdbuf.PushConstants(pipeline_layout, VK_SHADER_STAGE_FRAGMENT_BIT, viewport_con);
         cmdbuf.Draw(3, 1, 0, 0);
@@ -136,7 +135,7 @@ VkImageView SGSR::Draw(Scheduler& scheduler, size_t image_index, VkImage source_
         TransitionImageLayout(cmdbuf, stage0_image, VK_IMAGE_LAYOUT_GENERAL);
         TransitionImageLayout(cmdbuf, stage1_image, VK_IMAGE_LAYOUT_GENERAL);
         BeginRenderPass(cmdbuf, renderpass, stage1_framebuffer, extent);
-        cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, m_stage_pipeline[1]);
+        cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, *m_stage_pipeline[1]);
         cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline_layout, 0, stage1_descriptor_set, {});
         cmdbuf.PushConstants(pipeline_layout, VK_SHADER_STAGE_FRAGMENT_BIT, viewport_con);
         cmdbuf.Draw(3, 1, 0, 0);

src/video_core/renderer_vulkan/present/sgsr.h

@@ -14,6 +14,7 @@ class Scheduler;
 
 class SGSR {
 public:
+    static constexpr size_t SGSR_STAGE_COUNT = 2;
     explicit SGSR(const Device& device, MemoryAllocator& memory_allocator, size_t image_count, VkExtent2D extent);
     VkImageView Draw(Scheduler& scheduler, size_t image_index, VkImage source_image,
                      VkImageView source_image_view, VkExtent2D input_image_extent,
@@ -32,16 +33,16 @@ private:
     vk::DescriptorSetLayout m_descriptor_set_layout;
     vk::PipelineLayout m_pipeline_layout;
     vk::ShaderModule m_vert_shader;
-    vk::ShaderModule m_stage_shader[2];
-    vk::Pipeline m_stage_pipeline[2];
+    std::array<vk::ShaderModule, SGSR_STAGE_COUNT> m_stage_shader;
+    std::array<vk::Pipeline, SGSR_STAGE_COUNT> m_stage_pipeline;
     vk::RenderPass m_renderpass;
     vk::Sampler m_sampler;
 
     struct Images {
         vk::DescriptorSets descriptor_sets;
-        std::array<vk::Image, MaxSgsrStage> images;
-        std::array<vk::ImageView, MaxSgsrStage> image_views;
-        std::array<vk::Framebuffer, MaxSgsrStage> framebuffers;
+        std::array<vk::Image, SGSR_STAGE_COUNT> images;
+        std::array<vk::ImageView, SGSR_STAGE_COUNT> image_views;
+        std::array<vk::Framebuffer, SGSR_STAGE_COUNT> framebuffers;
     };
     std::vector<Images> m_dynamic_images;
     bool m_images_ready{};