Browse Source
[android] add sgsr to ui
[android] add sgsr to ui
13 changed files with 224 additions and 3 deletions
-
1src/android/app/src/main/res/values/arrays.xml
-
1src/android/app/src/main/res/values/strings.xml
-
2src/common/settings_enums.h
-
1src/qt_common/config/shared_translation.cpp
-
1src/qt_common/config/shared_translation.h
-
13src/video_core/host_shaders/sgsr1_shader.vert
-
1src/video_core/renderer_opengl/gl_blit_screen.cpp
-
2src/video_core/renderer_vulkan/present/layer.cpp
-
1src/video_core/renderer_vulkan/present/layer.h
-
150src/video_core/renderer_vulkan/present/sgsr.cpp
-
50src/video_core/renderer_vulkan/present/sgsr.h
-
1src/video_core/renderer_vulkan/vk_blit_screen.cpp
-
3src/yuzu/main_window.cpp
@ -0,0 +1,13 @@ |
|||||
|
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project |
||||
|
// SPDX-License-Identifier: GPL-2.0-or-later |
||||
|
|
||||
|
#version 450 |
||||
|
|
||||
|
layout(location = 0) out vec2 texcoord; |
||||
|
|
||||
|
void main() { |
||||
|
float x = float((gl_VertexIndex & 1) << 2); |
||||
|
float y = float((gl_VertexIndex & 2) << 1); |
||||
|
gl_Position = vec4(x - 1.0, y - 1.0, 0.0, 1.0); |
||||
|
texcoord = vec2(x, y) / 2.0; |
||||
|
} |
||||
@ -0,0 +1,150 @@ |
|||||
|
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
|
||||
|
#include "common/common_types.h"
|
||||
|
#include "common/div_ceil.h"
|
||||
|
#include "common/settings.h"
|
||||
|
|
||||
|
#include "video_core/fsr.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/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>; |
||||
|
|
||||
|
SGSR::SGSR(const Device& device, MemoryAllocator& memory_allocator, size_t image_count, VkExtent2D extent) |
||||
|
: m_device{device}, m_memory_allocator{memory_allocator} |
||||
|
, m_image_count{image_count}, m_extent{extent} |
||||
|
{ |
||||
|
m_dynamic_images.resize(m_image_count); |
||||
|
for (auto& images : m_dynamic_images) { |
||||
|
images.images[0] = CreateWrappedImage(m_memory_allocator, m_extent, VK_FORMAT_R16G16B16A16_SFLOAT); |
||||
|
images.images[1] = CreateWrappedImage(m_memory_allocator, m_extent, VK_FORMAT_R16G16B16A16_SFLOAT); |
||||
|
images.image_views[0] = CreateWrappedImageView(m_device, images.images[0], VK_FORMAT_R16G16B16A16_SFLOAT); |
||||
|
images.image_views[1] = CreateWrappedImageView(m_device, images.images[1], VK_FORMAT_R16G16B16A16_SFLOAT); |
||||
|
} |
||||
|
|
||||
|
m_renderpass = CreateWrappedRenderPass(m_device, VK_FORMAT_R16G16B16A16_SFLOAT); |
||||
|
for (auto& images : m_dynamic_images) { |
||||
|
images.framebuffers[0] = CreateWrappedFramebuffer(m_device, m_renderpass, images.image_views[0], m_extent); |
||||
|
images.framebuffers[1] = CreateWrappedFramebuffer(m_device, m_renderpass, images.image_views[1], m_extent); |
||||
|
} |
||||
|
|
||||
|
m_sampler = CreateBilinearSampler(m_device); |
||||
|
m_vert_shader = BuildShader(m_device, SGSR1_SHADER_VERT_SPV); |
||||
|
m_stage_shader[0] = BuildShader(m_device, SGSR1_SHADER_MOBILE_FRAG_SPV); |
||||
|
m_stage_shader[1] = BuildShader(m_device, SGSR1_SHADER_MOBILE_EDGE_DIRECTION_FRAG_SPV); |
||||
|
// 2 descriptors, 2 descriptor sets per invocation
|
||||
|
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); |
||||
|
for (auto& images : m_dynamic_images) |
||||
|
images.descriptor_sets = CreateWrappedDescriptorSets(m_descriptor_pool, layouts); |
||||
|
|
||||
|
const VkPushConstantRange range{ |
||||
|
.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT, |
||||
|
.offset = 0, |
||||
|
.size = sizeof(PushConstants), |
||||
|
}; |
||||
|
VkPipelineLayoutCreateInfo ci{ |
||||
|
.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO, |
||||
|
.pNext = nullptr, |
||||
|
.flags = 0, |
||||
|
.setLayoutCount = 1, |
||||
|
.pSetLayouts = m_descriptor_set_layout.address(), |
||||
|
.pushConstantRangeCount = 1, |
||||
|
.pPushConstantRanges = &range, |
||||
|
}; |
||||
|
m_pipeline_layout = m_device.GetLogical().CreatePipelineLayout(ci); |
||||
|
|
||||
|
m_stage_pipeline[0] = CreateWrappedPipeline(m_device, m_renderpass, m_pipeline_layout, std::tie(m_vert_shader, m_stage_shader[0])); |
||||
|
m_stage_pipeline[1] = CreateWrappedPipeline(m_device, m_renderpass, m_pipeline_layout, std::tie(m_vert_shader, m_stage_shader[1])); |
||||
|
} |
||||
|
|
||||
|
void SGSR::UpdateDescriptorSets(VkImageView image_view, size_t image_index) { |
||||
|
Images& images = m_dynamic_images[image_index]; |
||||
|
std::vector<VkDescriptorImageInfo> image_infos; |
||||
|
std::vector<VkWriteDescriptorSet> updates; |
||||
|
image_infos.reserve(2); |
||||
|
updates.push_back(CreateWriteDescriptorSet(image_infos, *m_sampler, image_view, images.descriptor_sets[0], 0)); |
||||
|
updates.push_back(CreateWriteDescriptorSet(image_infos, *m_sampler, *images.image_views[0], images.descriptor_sets[1], 0)); |
||||
|
m_device.GetLogical().UpdateDescriptorSets(updates, {}); |
||||
|
} |
||||
|
|
||||
|
void SGSR::UploadImages(Scheduler& scheduler) { |
||||
|
if (!m_images_ready) { |
||||
|
scheduler.Record([&](vk::CommandBuffer cmdbuf) { |
||||
|
for (auto& image : m_dynamic_images) { |
||||
|
ClearColorImage(cmdbuf, *image.images[0]); |
||||
|
ClearColorImage(cmdbuf, *image.images[1]); |
||||
|
} |
||||
|
}); |
||||
|
scheduler.Finish(); |
||||
|
m_images_ready = true; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
VkImageView SGSR::Draw(Scheduler& scheduler, size_t image_index, VkImage source_image, VkImageView source_image_view, VkExtent2D input_image_extent, const Common::Rectangle<f32>& crop_rect) { |
||||
|
Images& images = m_dynamic_images[image_index]; |
||||
|
VkImage stage0_image = *images.images[0]; |
||||
|
VkImage stage1_image = *images.images[1]; |
||||
|
VkDescriptorSet stage0_descriptor_set = images.descriptor_sets[0]; |
||||
|
VkDescriptorSet stage1_descriptor_set = images.descriptor_sets[1]; |
||||
|
VkFramebuffer stage0_framebuffer = *images.framebuffers[0]; |
||||
|
VkFramebuffer stage1_framebuffer = *images.framebuffers[1]; |
||||
|
VkPipelineLayout pipeline_layout = *m_pipeline_layout; |
||||
|
VkRenderPass renderpass = *m_renderpass; |
||||
|
VkExtent2D extent = m_extent; |
||||
|
|
||||
|
const f32 input_image_width = f32(input_image_extent.width); |
||||
|
const f32 input_image_height = f32(input_image_extent.height); |
||||
|
const f32 viewport_width = (crop_rect.right - crop_rect.left) * input_image_width; |
||||
|
const f32 viewport_x = crop_rect.left * input_image_width; |
||||
|
const f32 viewport_height = (crop_rect.bottom - crop_rect.top) * input_image_height; |
||||
|
const f32 viewport_y = crop_rect.top * input_image_height; |
||||
|
|
||||
|
// highp vec4
|
||||
|
PushConstants viewport_con{}; |
||||
|
*reinterpret_cast<f32*>(viewport_con.data() + 0) = viewport_x; |
||||
|
*reinterpret_cast<f32*>(viewport_con.data() + 1) = viewport_y; |
||||
|
*reinterpret_cast<f32*>(viewport_con.data() + 2) = viewport_width; |
||||
|
*reinterpret_cast<f32*>(viewport_con.data() + 3) = viewport_height; |
||||
|
|
||||
|
UploadImages(scheduler); |
||||
|
UpdateDescriptorSets(source_image_view, image_index); |
||||
|
|
||||
|
scheduler.RequestOutsideRenderPassOperationContext(); |
||||
|
scheduler.Record([=](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.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); |
||||
|
cmdbuf.EndRenderPass(); |
||||
|
//
|
||||
|
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.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); |
||||
|
cmdbuf.EndRenderPass(); |
||||
|
TransitionImageLayout(cmdbuf, stage1_image, VK_IMAGE_LAYOUT_GENERAL); |
||||
|
}); |
||||
|
|
||||
|
return *images.image_views[1]; |
||||
|
} |
||||
|
|
||||
|
} // namespace Vulkan
|
||||
@ -0,0 +1,50 @@ |
|||||
|
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project |
||||
|
// SPDX-License-Identifier: GPL-3.0-or-later |
||||
|
|
||||
|
#pragma once |
||||
|
|
||||
|
#include "common/math_util.h" |
||||
|
#include "video_core/vulkan_common/vulkan_memory_allocator.h" |
||||
|
#include "video_core/vulkan_common/vulkan_wrapper.h" |
||||
|
|
||||
|
namespace Vulkan { |
||||
|
|
||||
|
class Device; |
||||
|
class Scheduler; |
||||
|
|
||||
|
class SGSR { |
||||
|
public: |
||||
|
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, |
||||
|
const Common::Rectangle<f32>& crop_rect); |
||||
|
|
||||
|
private: |
||||
|
void UploadImages(Scheduler& scheduler); |
||||
|
void UpdateDescriptorSets(VkImageView image_view, size_t image_index); |
||||
|
|
||||
|
const Device& m_device; |
||||
|
MemoryAllocator& m_memory_allocator; |
||||
|
const size_t m_image_count; |
||||
|
const VkExtent2D m_extent; |
||||
|
|
||||
|
vk::DescriptorPool m_descriptor_pool; |
||||
|
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]; |
||||
|
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::vector<Images> m_dynamic_images; |
||||
|
bool m_images_ready{}; |
||||
|
}; |
||||
|
|
||||
|
} // namespace Vulkan |
||||
Write
Preview
Loading…
Cancel
Save
Reference in new issue