VERY experimental Nintendo Switch 2 emulator
C++
video_core: Implement vulkan clear specified channel
FengChen667f2331d17d
diff --git a/src/video_core/host_shaders/CMakeLists.txt b/src/video_core/host_shaders/CMakeLists.txtindex dad7b07d4a..52cd5bb811 100644--- a/src/video_core/host_shaders/CMakeLists.txt+++ b/src/video_core/host_shaders/CMakeLists.txt@@ -45,6 +45,8 @@ set(SHADER_FILESsmaa_neighborhood_blending.vertsmaa_neighborhood_blending.fragvulkan_blit_depth_stencil.frag+ vulkan_color_clear.frag+ vulkan_color_clear.vertvulkan_fidelityfx_fsr_easu_fp16.compvulkan_fidelityfx_fsr_easu_fp32.compvulkan_fidelityfx_fsr_rcas_fp16.compdiff --git a/src/video_core/host_shaders/vulkan_color_clear.frag b/src/video_core/host_shaders/vulkan_color_clear.fragnew file mode 100644index 0000000000..617bf01e17--- /dev/null+++ b/src/video_core/host_shaders/vulkan_color_clear.frag@@ -0,0 +1,14 @@+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#version 460 core++layout (push_constant) uniform PushConstants {+ vec4 clear_color;+};++layout(location = 0) out vec4 color;++void main() {+ color = clear_color;+}diff --git a/src/video_core/host_shaders/vulkan_color_clear.vert b/src/video_core/host_shaders/vulkan_color_clear.vertnew file mode 100644index 0000000000..d858831411--- /dev/null+++ b/src/video_core/host_shaders/vulkan_color_clear.vert@@ -0,0 +1,10 @@+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#version 460 core++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);+}diff --git a/src/video_core/renderer_vulkan/blit_image.cpp b/src/video_core/renderer_vulkan/blit_image.cppindex dd00d3edfa..cf2964a3f0 100644--- a/src/video_core/renderer_vulkan/blit_image.cpp+++ b/src/video_core/renderer_vulkan/blit_image.cpp@@ -12,6 +12,8 @@#include "video_core/host_shaders/convert_s8d24_to_abgr8_frag_spv.h"#include "video_core/host_shaders/full_screen_triangle_vert_spv.h"#include "video_core/host_shaders/vulkan_blit_depth_stencil_frag_spv.h"+#include "video_core/host_shaders/vulkan_color_clear_frag_spv.h"+#include "video_core/host_shaders/vulkan_color_clear_vert_spv.h"#include "video_core/renderer_vulkan/blit_image.h"#include "video_core/renderer_vulkan/maxwell_to_vk.h"#include "video_core/renderer_vulkan/vk_scheduler.h"@@ -69,10 +71,11 @@ constexpr VkDescriptorSetLayoutCreateInfo TWO_TEXTURES_DESCRIPTOR_SET_LAYOUT_CRE.bindingCount = static_cast<u32>(TWO_TEXTURES_DESCRIPTOR_SET_LAYOUT_BINDINGS.size()),.pBindings = TWO_TEXTURES_DESCRIPTOR_SET_LAYOUT_BINDINGS.data(),};-constexpr VkPushConstantRange PUSH_CONSTANT_RANGE{- .stageFlags = VK_SHADER_STAGE_VERTEX_BIT,+template <VkShaderStageFlags stageFlags, size_t size>+inline constexpr VkPushConstantRange PUSH_CONSTANT_RANGE{+ .stageFlags = stageFlags,.offset = 0,- .size = sizeof(PushConstants),+ .size = static_cast<u32>(size),};constexpr VkPipelineVertexInputStateCreateInfo PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO{.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,@@ -125,10 +128,8 @@ constexpr VkPipelineMultisampleStateCreateInfo PIPELINE_MULTISAMPLE_STATE_CREATE.alphaToCoverageEnable = VK_FALSE,.alphaToOneEnable = VK_FALSE,};-constexpr std::array DYNAMIC_STATES{- VK_DYNAMIC_STATE_VIEWPORT,- VK_DYNAMIC_STATE_SCISSOR,-};+constexpr std::array DYNAMIC_STATES{VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR,+ VK_DYNAMIC_STATE_BLEND_CONSTANTS};constexpr VkPipelineDynamicStateCreateInfo PIPELINE_DYNAMIC_STATE_CREATE_INFO{.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,.pNext = nullptr,@@ -205,15 +206,15 @@ inline constexpr VkSamplerCreateInfo SAMPLER_CREATE_INFO{};constexpr VkPipelineLayoutCreateInfo PipelineLayoutCreateInfo(- const VkDescriptorSetLayout* set_layout) {+ const VkDescriptorSetLayout* set_layout, vk::Span<VkPushConstantRange> push_constants) {return VkPipelineLayoutCreateInfo{.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,.pNext = nullptr,.flags = 0,- .setLayoutCount = 1,+ .setLayoutCount = (set_layout != nullptr ? 1u : 0u),.pSetLayouts = set_layout,- .pushConstantRangeCount = 1,- .pPushConstantRanges = &PUSH_CONSTANT_RANGE,+ .pushConstantRangeCount = push_constants.size(),+ .pPushConstantRanges = push_constants.data(),};}@@ -302,8 +303,7 @@ void UpdateTwoTexturesDescriptorSet(const Device& device, VkDescriptorSet descridevice.GetLogical().UpdateDescriptorSets(write_descriptor_sets, nullptr);}-void BindBlitState(vk::CommandBuffer cmdbuf, VkPipelineLayout layout, const Region2D& dst_region,- const Region2D& src_region, const Extent3D& src_size = {1, 1, 1}) {+void BindBlitState(vk::CommandBuffer cmdbuf, const Region2D& dst_region) {const VkOffset2D offset{.x = std::min(dst_region.start.x, dst_region.end.x),.y = std::min(dst_region.start.y, dst_region.end.y),@@ -325,6 +325,13 @@ void BindBlitState(vk::CommandBuffer cmdbuf, VkPipelineLayout layout, const Regi.offset = offset,.extent = extent,};+ cmdbuf.SetViewport(0, viewport);+ cmdbuf.SetScissor(0, scissor);+}++void BindBlitState(vk::CommandBuffer cmdbuf, VkPipelineLayout layout, const Region2D& dst_region,+ const Region2D& src_region, const Extent3D& src_size = {1, 1, 1}) {+ BindBlitState(cmdbuf, dst_region);const float scale_x = static_cast<float>(src_region.end.x - src_region.start.x) /static_cast<float>(src_size.width);const float scale_y = static_cast<float>(src_region.end.y - src_region.start.y) /@@ -335,8 +342,6 @@ void BindBlitState(vk::CommandBuffer cmdbuf, VkPipelineLayout layout, const Registatic_cast<float>(src_region.start.y) /static_cast<float>(src_size.height)},};- cmdbuf.SetViewport(0, viewport);- cmdbuf.SetScissor(0, scissor);cmdbuf.PushConstants(layout, VK_SHADER_STAGE_VERTEX_BIT, push_constants);}@@ -408,13 +413,20 @@ BlitImageHelper::BlitImageHelper(const Device& device_, Scheduler& scheduler_,descriptor_pool.Allocator(*one_texture_set_layout, TEXTURE_DESCRIPTOR_BANK_INFO<1>)},two_textures_descriptor_allocator{descriptor_pool.Allocator(*two_textures_set_layout, TEXTURE_DESCRIPTOR_BANK_INFO<2>)},- one_texture_pipeline_layout(device.GetLogical().CreatePipelineLayout(- PipelineLayoutCreateInfo(one_texture_set_layout.address()))),- two_textures_pipeline_layout(device.GetLogical().CreatePipelineLayout(- PipelineLayoutCreateInfo(two_textures_set_layout.address()))),+ one_texture_pipeline_layout(device.GetLogical().CreatePipelineLayout(PipelineLayoutCreateInfo(+ one_texture_set_layout.address(),+ PUSH_CONSTANT_RANGE<VK_SHADER_STAGE_VERTEX_BIT, sizeof(PushConstants)>))),+ two_textures_pipeline_layout(+ device.GetLogical().CreatePipelineLayout(PipelineLayoutCreateInfo(+ two_textures_set_layout.address(),+ PUSH_CONSTANT_RANGE<VK_SHADER_STAGE_VERTEX_BIT, sizeof(PushConstants)>))),+ clear_color_pipeline_layout(device.GetLogical().CreatePipelineLayout(PipelineLayoutCreateInfo(+ nullptr, PUSH_CONSTANT_RANGE<VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(float) * 4>))),full_screen_vert(BuildShader(device, FULL_SCREEN_TRIANGLE_VERT_SPV)),blit_color_to_color_frag(BuildShader(device, BLIT_COLOR_FLOAT_FRAG_SPV)),blit_depth_stencil_frag(BuildShader(device, VULKAN_BLIT_DEPTH_STENCIL_FRAG_SPV)),+ clear_color_vert(BuildShader(device, VULKAN_COLOR_CLEAR_VERT_SPV)),+ clear_color_frag(BuildShader(device, VULKAN_COLOR_CLEAR_FRAG_SPV)),convert_depth_to_float_frag(BuildShader(device, CONVERT_DEPTH_TO_FLOAT_FRAG_SPV)),convert_float_to_depth_frag(BuildShader(device, CONVERT_FLOAT_TO_DEPTH_FRAG_SPV)),convert_abgr8_to_d24s8_frag(BuildShader(device, CONVERT_ABGR8_TO_D24S8_FRAG_SPV)),@@ -553,6 +565,30 @@ void BlitImageHelper::ConvertS8D24ToABGR8(const Framebuffer* dst_framebuffer,ConvertDepthStencil(*convert_s8d24_to_abgr8_pipeline, dst_framebuffer, src_image_view);}+void BlitImageHelper::ClearColor(const Framebuffer* dst_framebuffer, u8 color_mask,+ const std::array<f32, 4>& clear_color,+ const Region2D& dst_region) {+ const BlitImagePipelineKey key{+ .renderpass = dst_framebuffer->RenderPass(),+ .operation = Tegra::Engines::Fermi2D::Operation::BlendPremult,+ };+ const VkPipeline pipeline = FindOrEmplaceClearColorPipeline(key);+ const VkPipelineLayout layout = *clear_color_pipeline_layout;+ scheduler.RequestRenderpass(dst_framebuffer);+ scheduler.Record(+ [pipeline, layout, color_mask, clear_color, dst_region](vk::CommandBuffer cmdbuf) {+ cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);+ const std::array blend_color = {+ (color_mask & 0x1) ? 1.0f : 0.0f, (color_mask & 0x2) ? 1.0f : 0.0f,+ (color_mask & 0x4) ? 1.0f : 0.0f, (color_mask & 0x8) ? 1.0f : 0.0f};+ cmdbuf.SetBlendConstants(blend_color.data());+ BindBlitState(cmdbuf, dst_region);+ cmdbuf.PushConstants(layout, VK_SHADER_STAGE_FRAGMENT_BIT, clear_color);+ cmdbuf.Draw(3, 1, 0, 0);+ });+ scheduler.InvalidateState();+}+void BlitImageHelper::Convert(VkPipeline pipeline, const Framebuffer* dst_framebuffer,const ImageView& src_image_view) {const VkPipelineLayout layout = *one_texture_pipeline_layout;@@ -728,6 +764,58 @@ VkPipeline BlitImageHelper::FindOrEmplaceDepthStencilPipeline(const BlitImagePipreturn *blit_depth_stencil_pipelines.back();}+VkPipeline BlitImageHelper::FindOrEmplaceClearColorPipeline(const BlitImagePipelineKey& key) {+ const auto it = std::ranges::find(clear_color_keys, key);+ if (it != clear_color_keys.end()) {+ return *clear_color_pipelines[std::distance(clear_color_keys.begin(), it)];+ }+ clear_color_keys.push_back(key);+ const std::array stages = MakeStages(*clear_color_vert, *clear_color_frag);+ const VkPipelineColorBlendAttachmentState color_blend_attachment_state{+ .blendEnable = VK_TRUE,+ .srcColorBlendFactor = VK_BLEND_FACTOR_CONSTANT_COLOR,+ .dstColorBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR,+ .colorBlendOp = VK_BLEND_OP_ADD,+ .srcAlphaBlendFactor = VK_BLEND_FACTOR_CONSTANT_ALPHA,+ .dstAlphaBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA,+ .alphaBlendOp = VK_BLEND_OP_ADD,+ .colorWriteMask = VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT |+ VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT,+ };+ const VkPipelineColorBlendStateCreateInfo color_blend_state_generic_create_info{+ .sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO,+ .pNext = nullptr,+ .flags = 0,+ .logicOpEnable = VK_FALSE,+ .logicOp = VK_LOGIC_OP_CLEAR,+ .attachmentCount = 1,+ .pAttachments = &color_blend_attachment_state,+ .blendConstants = {0.0f, 0.0f, 0.0f, 0.0f},+ };+ clear_color_pipelines.push_back(device.GetLogical().CreateGraphicsPipeline({+ .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,+ .pNext = nullptr,+ .flags = 0,+ .stageCount = static_cast<u32>(stages.size()),+ .pStages = stages.data(),+ .pVertexInputState = &PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,+ .pInputAssemblyState = &PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,+ .pTessellationState = nullptr,+ .pViewportState = &PIPELINE_VIEWPORT_STATE_CREATE_INFO,+ .pRasterizationState = &PIPELINE_RASTERIZATION_STATE_CREATE_INFO,+ .pMultisampleState = &PIPELINE_MULTISAMPLE_STATE_CREATE_INFO,+ .pDepthStencilState = &PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,+ .pColorBlendState = &color_blend_state_generic_create_info,+ .pDynamicState = &PIPELINE_DYNAMIC_STATE_CREATE_INFO,+ .layout = *clear_color_pipeline_layout,+ .renderPass = key.renderpass,+ .subpass = 0,+ .basePipelineHandle = VK_NULL_HANDLE,+ .basePipelineIndex = 0,+ }));+ return *clear_color_pipelines.back();+}+void BlitImageHelper::ConvertPipeline(vk::Pipeline& pipeline, VkRenderPass renderpass,bool is_target_depth) {if (pipeline) {diff --git a/src/video_core/renderer_vulkan/blit_image.h b/src/video_core/renderer_vulkan/blit_image.hindex be8a9a2f67..2976a7d91a 100644--- a/src/video_core/renderer_vulkan/blit_image.h+++ b/src/video_core/renderer_vulkan/blit_image.h@@ -61,6 +61,9 @@ public:void ConvertS8D24ToABGR8(const Framebuffer* dst_framebuffer, ImageView& src_image_view);+ void ClearColor(const Framebuffer* dst_framebuffer, u8 color_mask,+ const std::array<f32, 4>& clear_color, const Region2D& dst_region);+private:void Convert(VkPipeline pipeline, const Framebuffer* dst_framebuffer,const ImageView& src_image_view);@@ -72,6 +75,8 @@ private:[[nodiscard]] VkPipeline FindOrEmplaceDepthStencilPipeline(const BlitImagePipelineKey& key);+ [[nodiscard]] VkPipeline FindOrEmplaceClearColorPipeline(const BlitImagePipelineKey& key);+void ConvertPipeline(vk::Pipeline& pipeline, VkRenderPass renderpass, bool is_target_depth);void ConvertDepthToColorPipeline(vk::Pipeline& pipeline, VkRenderPass renderpass);@@ -97,9 +102,12 @@ private:DescriptorAllocator two_textures_descriptor_allocator;vk::PipelineLayout one_texture_pipeline_layout;vk::PipelineLayout two_textures_pipeline_layout;+ vk::PipelineLayout clear_color_pipeline_layout;vk::ShaderModule full_screen_vert;vk::ShaderModule blit_color_to_color_frag;vk::ShaderModule blit_depth_stencil_frag;+ vk::ShaderModule clear_color_vert;+ vk::ShaderModule clear_color_frag;vk::ShaderModule convert_depth_to_float_frag;vk::ShaderModule convert_float_to_depth_frag;vk::ShaderModule convert_abgr8_to_d24s8_frag;@@ -112,6 +120,8 @@ private:std::vector<vk::Pipeline> blit_color_pipelines;std::vector<BlitImagePipelineKey> blit_depth_stencil_keys;std::vector<vk::Pipeline> blit_depth_stencil_pipelines;+ std::vector<BlitImagePipelineKey> clear_color_keys;+ std::vector<vk::Pipeline> clear_color_pipelines;vk::Pipeline convert_d32_to_r32_pipeline;vk::Pipeline convert_r32_to_d32_pipeline;vk::Pipeline convert_d16_to_r16_pipeline;diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cppindex 86ef0daeb6..719edbcfbe 100644--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp@@ -394,7 +394,15 @@ void RasterizerVulkan::Clear(u32 layer_count) {cmdbuf.ClearAttachments(attachment, clear_rect);});} else {- UNIMPLEMENTED_MSG("Unimplemented Clear only the specified channel");+ u8 color_mask = static_cast<u8>(regs.clear_surface.R | regs.clear_surface.G << 1 |+ regs.clear_surface.B << 2 | regs.clear_surface.A << 3);+ Region2D dst_region = {+ Offset2D{.x = clear_rect.rect.offset.x, .y = clear_rect.rect.offset.y},+ Offset2D{.x = clear_rect.rect.offset.x ++ static_cast<s32>(clear_rect.rect.extent.width),+ .y = clear_rect.rect.offset.y ++ static_cast<s32>(clear_rect.rect.extent.height)}};+ blit_image.ClearColor(framebuffer, color_mask, regs.clear_color, dst_region);}}