Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-05-13 21:47:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[vulkan] Adjustments to wrong access of image-memory barrier on depth fragments + blending extended enabling method

Browse source
This commit is contained in:
CamilleLaVey 2026-03-05 21:09:50 -04:00 • committed by lizzie
parent c931de0570
commit ee1ffbaf2e
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
View file

@ -23,6 +23,7 @@
#include "video_core/renderer_vulkan/vk_scheduler.h" #include "video_core/renderer_vulkan/vk_scheduler.h"
#include "video_core/renderer_vulkan/vk_texture_cache.h" #include "video_core/renderer_vulkan/vk_texture_cache.h"
#include "video_core/renderer_vulkan/vk_update_descriptor.h" #include "video_core/renderer_vulkan/vk_update_descriptor.h"
#include "video_core/surface.h"
#include "video_core/shader_notify.h" #include "video_core/shader_notify.h"
#include "video_core/texture_cache/texture_cache.h" #include "video_core/texture_cache/texture_cache.h"
#include "video_core/vulkan_common/vulkan_device.h" #include "video_core/vulkan_common/vulkan_device.h"
@ -866,13 +867,14 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
VK_COLOR_COMPONENT_A_BIT, VK_COLOR_COMPONENT_A_BIT,
}; };
const auto& blend{key.state.attachments[index]}; const auto& blend{key.state.attachments[index]};
const bool supports_blending = !VideoCore::Surface::IsPixelFormatInteger(key.color_formats[index]);
const std::array mask{blend.Mask()}; const std::array mask{blend.Mask()};
VkColorComponentFlags write_mask{}; VkColorComponentFlags write_mask{};
for (size_t i = 0; i < mask_table.size(); ++i) { for (size_t i = 0; i < mask_table.size(); ++i) {
write_mask |= mask[i] ? mask_table[i] : 0; write_mask |= mask[i] ? mask_table[i] : 0;
} }
cb_attachments.push_back({ cb_attachments.push_back({
.blendEnable = blend.enable != 0, .blendEnable = supports_blending && blend.enable != 0,
.srcColorBlendFactor = MaxwellToVK::BlendFactor(blend.SourceRGBFactor()), .srcColorBlendFactor = MaxwellToVK::BlendFactor(blend.SourceRGBFactor()),
.dstColorBlendFactor = MaxwellToVK::BlendFactor(blend.DestRGBFactor()), .dstColorBlendFactor = MaxwellToVK::BlendFactor(blend.DestRGBFactor()),
.colorBlendOp = MaxwellToVK::BlendEquation(blend.EquationRGB()), .colorBlendOp = MaxwellToVK::BlendEquation(blend.EquationRGB()),

12
src/video_core/renderer_vulkan/vk_scheduler.cpp
View file

@ -337,6 +337,13 @@ void Scheduler::EndRenderPass()
images = renderpass_images, images = renderpass_images,
ranges = renderpass_image_ranges](vk::CommandBuffer cmdbuf) { ranges = renderpass_image_ranges](vk::CommandBuffer cmdbuf) {
std::array<VkImageMemoryBarrier, 9> barriers; std::array<VkImageMemoryBarrier, 9> barriers;
constexpr VkPipelineStageFlags src_stages =
VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |
VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
constexpr VkPipelineStageFlags dst_stages =
VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT |
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT;
for (size_t i = 0; i < num_images; ++i) { for (size_t i = 0; i < num_images; ++i) {
const VkImageSubresourceRange& range = ranges[i]; const VkImageSubresourceRange& range = ranges[i];
const bool is_color = (range.aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) != 0; const bool is_color = (range.aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) != 0;
@ -372,9 +379,8 @@ void Scheduler::EndRenderPass()
}; };
} }
cmdbuf.EndRenderPass(); cmdbuf.EndRenderPass();
cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT | cmdbuf.PipelineBarrier(src_stages, dst_stages, 0, nullptr, nullptr,
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | vk::Span(barriers.data(), num_images));
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, 0, nullptr, nullptr, vk::Span(barriers.data(), num_images));
}); });
state.renderpass = VkRenderPass{}; state.renderpass = VkRenderPass{};