mirror of
https://git.eden-emu.dev/eden-emu/eden
synced 2026-06-28 16:15:34 +02:00
[video_core] Add SSAA antialiasing
Signed-off-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
parent
eaad33adcd
commit
2c6f9329e1
13 changed files with 225 additions and 4 deletions
|
|
@ -750,8 +750,6 @@
|
|||
|
||||
<!-- Anti-Aliasing -->
|
||||
<string name="anti_aliasing_none">هیچ</string>
|
||||
<string name="anti_aliasing_fxaa">FXAA</string>
|
||||
<string name="anti_aliasing_smaa">SMAA</string>
|
||||
|
||||
<!-- Screen Layouts -->
|
||||
<string name="screen_layout_auto">خودکار</string>
|
||||
|
|
|
|||
|
|
@ -266,6 +266,7 @@
|
|||
<item>@string/anti_aliasing_none</item>
|
||||
<item>@string/anti_aliasing_fxaa</item>
|
||||
<item>@string/anti_aliasing_smaa</item>
|
||||
<item>@string/anti_aliasing_ssaa</item>
|
||||
</string-array>
|
||||
|
||||
<integer-array name="rendererAntiAliasingValues">
|
||||
|
|
|
|||
|
|
@ -1087,6 +1087,7 @@
|
|||
<string name="anti_aliasing_none">None</string>
|
||||
<string name="anti_aliasing_fxaa" translatable="false">FXAA</string>
|
||||
<string name="anti_aliasing_smaa" translatable="false">SMAA</string>
|
||||
<string name="anti_aliasing_smaa" translatable="false">SSAA</string>
|
||||
|
||||
<!-- Screen Layouts -->
|
||||
<string name="screen_layout_auto">Auto</string>
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ ENUM(FullscreenMode, Borderless, Exclusive);
|
|||
ENUM(NvdecEmulation, Off, Cpu, Gpu);
|
||||
ENUM(ResolutionSetup, Res1_4X, Res1_2X, Res3_4X, Res1X, Res5_4X, Res3_2X, Res2X, Res3X, Res4X, Res5X, Res6X, Res7X, Res8X);
|
||||
ENUM(ScalingFilter, NearestNeighbor, Bilinear, Bicubic, Gaussian, Lanczos, ScaleForce, Fsr, Area, ZeroTangent, BSpline, Mitchell, Spline1, Mmpx, Sgsr, SgsrEdge, MaxEnum);
|
||||
ENUM(AntiAliasing, None, Fxaa, Smaa, MaxEnum);
|
||||
ENUM(AntiAliasing, None, Fxaa, Smaa, Ssaa, MaxEnum);
|
||||
ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch);
|
||||
ENUM(ConsoleMode, Handheld, Docked);
|
||||
ENUM(AppletMode, HLE, LLE);
|
||||
|
|
|
|||
|
|
@ -500,6 +500,7 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent) {
|
|||
PAIR(AntiAliasing, None, tr("None")),
|
||||
PAIR(AntiAliasing, Fxaa, tr("FXAA")),
|
||||
PAIR(AntiAliasing, Smaa, tr("SMAA")),
|
||||
PAIR(AntiAliasing, Ssaa, tr("SSAA")),
|
||||
}});
|
||||
translations->insert({Settings::EnumMetadata<Settings::AspectRatio>::Index(),
|
||||
{
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ static const std::map<Settings::AntiAliasing, QString> anti_aliasing_texts_map =
|
|||
{Settings::AntiAliasing::None, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "None"))},
|
||||
{Settings::AntiAliasing::Fxaa, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "FXAA"))},
|
||||
{Settings::AntiAliasing::Smaa, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "SMAA"))},
|
||||
{Settings::AntiAliasing::Ssaa, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "SSAA"))},
|
||||
};
|
||||
|
||||
static const std::map<Settings::ScalingFilter, QString> scaling_filter_texts_map = {
|
||||
|
|
|
|||
|
|
@ -125,6 +125,8 @@ add_library(video_core STATIC
|
|||
renderer_vulkan/present/fsr.h
|
||||
renderer_vulkan/present/fxaa.cpp
|
||||
renderer_vulkan/present/fxaa.h
|
||||
renderer_vulkan/present/ssaa.cpp
|
||||
renderer_vulkan/present/ssaa.h
|
||||
renderer_vulkan/present/layer.cpp
|
||||
renderer_vulkan/present/layer.h
|
||||
renderer_vulkan/present/present_push_constants.h
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ set(SHADER_FILES
|
|||
${CMAKE_CURRENT_SOURCE_DIR}/smaa_blending_weight_calculation.frag
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/smaa_neighborhood_blending.vert
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/smaa_neighborhood_blending.frag
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/ssaa.frag
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/vulkan_blit_depth_stencil.frag
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/vulkan_color_clear.frag
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/vulkan_color_clear.vert
|
||||
|
|
|
|||
19
src/video_core/host_shaders/ssaa.frag
Normal file
19
src/video_core/host_shaders/ssaa.frag
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#version 460
|
||||
#extension GL_ARB_sample_shading : enable
|
||||
|
||||
#ifdef VULKAN
|
||||
#define BINDING_COLOR_TEXTURE 1
|
||||
#else // ^^^ Vulkan ^^^ // vvv OpenGL vvv
|
||||
#define BINDING_COLOR_TEXTURE 0
|
||||
#endif
|
||||
|
||||
layout (location = 0) in vec4 posPos;
|
||||
layout (location = 0) out vec4 frag_color;
|
||||
layout (binding = BINDING_COLOR_TEXTURE) uniform sampler2D input_texture;
|
||||
|
||||
void main() {
|
||||
frag_color = texelFetch(input_texture, ivec2(posPos.xy * textureSize(input_texture)), gl_SampleID);
|
||||
}
|
||||
|
|
@ -111,6 +111,8 @@ void Layer::ConfigureDraw(PresentPushConstants* out_push_constants,
|
|||
fxaa->Draw(scheduler, image_index, &source_image, &source_image_view);
|
||||
} else if (auto* smaa = std::get_if<SMAA>(&anti_alias)) {
|
||||
smaa->Draw(scheduler, image_index, &source_image, &source_image_view);
|
||||
} else if (auto* ssaa = std::get_if<SSAA>(&anti_alias)) {
|
||||
ssaa->Draw(scheduler, image_index, &source_image, &source_image_view);
|
||||
}
|
||||
|
||||
auto crop_rect = Tegra::NormalizeCrop(framebuffer, texture_width, texture_height);
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
#include "video_core/renderer_vulkan/present/sgsr.h"
|
||||
#include "video_core/renderer_vulkan/present/fxaa.h"
|
||||
#include "video_core/renderer_vulkan/present/smaa.h"
|
||||
#include "video_core/renderer_vulkan/present/ssaa.h"
|
||||
|
||||
namespace Layout {
|
||||
struct FramebufferLayout;
|
||||
|
|
@ -95,7 +96,7 @@ private:
|
|||
Service::android::PixelFormat pixel_format{};
|
||||
|
||||
Settings::AntiAliasing anti_alias_setting{};
|
||||
std::variant<std::monostate, FXAA, SMAA> anti_alias{};
|
||||
std::variant<std::monostate, FXAA, SMAA, SSAA> anti_alias{};
|
||||
std::variant<std::monostate, SGSR, FSR> sr_filter{};
|
||||
std::vector<u64> resource_ticks{};
|
||||
};
|
||||
|
|
|
|||
131
src/video_core/renderer_vulkan/present/ssaa.cpp
Normal file
131
src/video_core/renderer_vulkan/present/ssaa.cpp
Normal file
|
|
@ -0,0 +1,131 @@
|
|||
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include "common/common_types.h"
|
||||
|
||||
#include "video_core/host_shaders/ssaa_frag_spv.h"
|
||||
#include "video_core/host_shaders/full_screen_triangle_vert_spv.h"
|
||||
#include "video_core/renderer_vulkan/present/ssaa.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 {
|
||||
|
||||
SSAA::SSAA(const Device& device, MemoryAllocator& allocator, size_t image_count, VkExtent2D extent)
|
||||
: m_device(device), m_allocator(allocator), m_extent(extent)
|
||||
, m_image_count(u32(image_count))
|
||||
{
|
||||
CreateImages();
|
||||
CreateRenderPasses();
|
||||
CreateSampler();
|
||||
CreateShaders();
|
||||
CreateDescriptorPool();
|
||||
CreateDescriptorSetLayouts();
|
||||
CreateDescriptorSets();
|
||||
CreatePipelineLayouts();
|
||||
CreatePipelines();
|
||||
}
|
||||
|
||||
SSAA::~SSAA() = default;
|
||||
|
||||
void SSAA::CreateImages() {
|
||||
for (u32 i = 0; i < m_image_count; i++) {
|
||||
Image& image = m_dynamic_images.emplace_back();
|
||||
image.image = CreateWrappedImage(m_allocator, m_extent, VK_FORMAT_R16G16B16A16_SFLOAT);
|
||||
image.image_view = CreateWrappedImageView(m_device, image.image, VK_FORMAT_R16G16B16A16_SFLOAT);
|
||||
}
|
||||
}
|
||||
|
||||
void SSAA::CreateRenderPasses() {
|
||||
m_renderpass = CreateWrappedRenderPass(m_device, VK_FORMAT_R16G16B16A16_SFLOAT);
|
||||
for (auto& image : m_dynamic_images) {
|
||||
image.framebuffer = CreateWrappedFramebuffer(m_device, m_renderpass, image.image_view, m_extent);
|
||||
}
|
||||
}
|
||||
|
||||
void SSAA::CreateSampler() {
|
||||
m_sampler = CreateWrappedSampler(m_device);
|
||||
}
|
||||
|
||||
void SSAA::CreateShaders() {
|
||||
m_vertex_shader = CreateWrappedShaderModule(m_device, FULL_SCREEN_TRIANGLE_VERT_SPV);
|
||||
m_fragment_shader = CreateWrappedShaderModule(m_device, SSAA_FRAG_SPV);
|
||||
}
|
||||
|
||||
void SSAA::CreateDescriptorPool() {
|
||||
// 2 descriptors, 1 descriptor set per image
|
||||
m_descriptor_pool = CreateWrappedDescriptorPool(m_device, 2 * m_image_count, m_image_count);
|
||||
}
|
||||
|
||||
void SSAA::CreateDescriptorSetLayouts() {
|
||||
m_descriptor_set_layout = CreateWrappedDescriptorSetLayout(m_device, {VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER});
|
||||
}
|
||||
|
||||
void SSAA::CreateDescriptorSets() {
|
||||
VkDescriptorSetLayout layout = *m_descriptor_set_layout;
|
||||
for (auto& images : m_dynamic_images)
|
||||
images.descriptor_sets = CreateWrappedDescriptorSets(m_descriptor_pool, {layout});
|
||||
}
|
||||
|
||||
void SSAA::CreatePipelineLayouts() {
|
||||
m_pipeline_layout = CreateWrappedPipelineLayout(m_device, m_descriptor_set_layout);
|
||||
}
|
||||
|
||||
void SSAA::CreatePipelines() {
|
||||
m_pipeline = CreateWrappedPipeline(m_device, m_renderpass, m_pipeline_layout, std::tie(m_vertex_shader, m_fragment_shader));
|
||||
}
|
||||
|
||||
void SSAA::UpdateDescriptorSets(VkImageView image_view, size_t image_index) {
|
||||
Image& image = 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, image.descriptor_sets[0], 0));
|
||||
updates.push_back(CreateWriteDescriptorSet(image_infos, *m_sampler, image_view, image.descriptor_sets[0], 1));
|
||||
m_device.GetLogical().UpdateDescriptorSets(updates, {});
|
||||
}
|
||||
|
||||
void SSAA::UploadImages(Scheduler& scheduler) {
|
||||
if (!m_images_ready) {
|
||||
m_images_ready = true;
|
||||
scheduler.Record([&](vk::CommandBuffer cmdbuf) {
|
||||
for (auto& image : m_dynamic_images)
|
||||
ClearColorImage(cmdbuf, *image.image);
|
||||
});
|
||||
scheduler.Finish();
|
||||
}
|
||||
}
|
||||
|
||||
void SSAA::Draw(Scheduler& scheduler, size_t image_index, VkImage* inout_image, VkImageView* inout_image_view) {
|
||||
const Image& image{m_dynamic_images[image_index]};
|
||||
const VkImage input_image{*inout_image};
|
||||
const VkImage output_image{*image.image};
|
||||
const VkDescriptorSet descriptor_set{image.descriptor_sets[0]};
|
||||
const VkFramebuffer framebuffer{*image.framebuffer};
|
||||
const VkRenderPass renderpass{*m_renderpass};
|
||||
const VkPipeline pipeline{*m_pipeline};
|
||||
const VkPipelineLayout layout{*m_pipeline_layout};
|
||||
const VkExtent2D extent{m_extent};
|
||||
|
||||
UploadImages(scheduler);
|
||||
UpdateDescriptorSets(*inout_image_view, image_index);
|
||||
|
||||
scheduler.RequestOutsideRenderPassOperationContext();
|
||||
scheduler.Record([=](vk::CommandBuffer cmdbuf) {
|
||||
TransitionImageLayout(cmdbuf, input_image, VK_IMAGE_LAYOUT_GENERAL);
|
||||
TransitionImageLayout(cmdbuf, output_image, VK_IMAGE_LAYOUT_GENERAL);
|
||||
BeginRenderPass(cmdbuf, renderpass, framebuffer, extent);
|
||||
cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
|
||||
cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, layout, 0, descriptor_set, {});
|
||||
cmdbuf.Draw(3, 1, 0, 0);
|
||||
cmdbuf.EndRenderPass();
|
||||
TransitionImageLayout(cmdbuf, output_image, VK_IMAGE_LAYOUT_GENERAL);
|
||||
});
|
||||
|
||||
*inout_image = *image.image;
|
||||
*inout_image_view = *image.image_view;
|
||||
}
|
||||
|
||||
} // namespace Vulkan
|
||||
63
src/video_core/renderer_vulkan/present/ssaa.h
Normal file
63
src/video_core/renderer_vulkan/present/ssaa.h
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "video_core/renderer_vulkan/present/anti_alias_pass.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 StagingBufferPool;
|
||||
|
||||
class SSAA final : public AntiAliasPass {
|
||||
public:
|
||||
explicit SSAA(const Device& device, MemoryAllocator& allocator, size_t image_count,
|
||||
VkExtent2D extent);
|
||||
~SSAA() override;
|
||||
|
||||
void Draw(Scheduler& scheduler, size_t image_index, VkImage* inout_image,
|
||||
VkImageView* inout_image_view) override;
|
||||
|
||||
private:
|
||||
void CreateImages();
|
||||
void CreateRenderPasses();
|
||||
void CreateSampler();
|
||||
void CreateShaders();
|
||||
void CreateDescriptorPool();
|
||||
void CreateDescriptorSetLayouts();
|
||||
void CreateDescriptorSets();
|
||||
void CreatePipelineLayouts();
|
||||
void CreatePipelines();
|
||||
void UpdateDescriptorSets(VkImageView image_view, size_t image_index);
|
||||
void UploadImages(Scheduler& scheduler);
|
||||
|
||||
const Device& m_device;
|
||||
MemoryAllocator& m_allocator;
|
||||
const VkExtent2D m_extent;
|
||||
const u32 m_image_count;
|
||||
|
||||
vk::ShaderModule m_vertex_shader{};
|
||||
vk::ShaderModule m_fragment_shader{};
|
||||
vk::DescriptorPool m_descriptor_pool{};
|
||||
vk::DescriptorSetLayout m_descriptor_set_layout{};
|
||||
vk::PipelineLayout m_pipeline_layout{};
|
||||
vk::Pipeline m_pipeline{};
|
||||
vk::RenderPass m_renderpass{};
|
||||
|
||||
struct Image {
|
||||
vk::DescriptorSets descriptor_sets{};
|
||||
vk::Framebuffer framebuffer{};
|
||||
vk::Image image{};
|
||||
vk::ImageView image_view{};
|
||||
};
|
||||
std::vector<Image> m_dynamic_images{};
|
||||
bool m_images_ready{};
|
||||
|
||||
vk::Sampler m_sampler{};
|
||||
};
|
||||
|
||||
} // namespace Vulkan
|
||||
Loading…
Add table
Add a link
Reference in a new issue