diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-10-17 17:48:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-17 17:48:57 +0200 |
| commit | fa56518f209ad17ca0a46c408cc752d4083137ea (patch) | |
| tree | 0d33133e57675a5bfb2cee830b03aa7cd8effea2 /src/video_core/renderer_vulkan | |
| parent | Merge pull request #11349 from vonchenplus/buffer_cache_crash (diff) | |
| parent | Get out of render pass before query barriers, fix image names with samples > 1, remove image alias bit (diff) | |
| download | yuzu-fa56518f209ad17ca0a46c408cc752d4083137ea.tar yuzu-fa56518f209ad17ca0a46c408cc752d4083137ea.tar.gz yuzu-fa56518f209ad17ca0a46c408cc752d4083137ea.tar.bz2 yuzu-fa56518f209ad17ca0a46c408cc752d4083137ea.tar.lz yuzu-fa56518f209ad17ca0a46c408cc752d4083137ea.tar.xz yuzu-fa56518f209ad17ca0a46c408cc752d4083137ea.tar.zst yuzu-fa56518f209ad17ca0a46c408cc752d4083137ea.zip | |
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_query_cache.cpp | 1 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_render_pass_cache.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/video_core/renderer_vulkan/vk_query_cache.cpp b/src/video_core/renderer_vulkan/vk_query_cache.cpp index 2edaafa7e..66c03bf17 100644 --- a/src/video_core/renderer_vulkan/vk_query_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_query_cache.cpp @@ -1436,6 +1436,7 @@ void QueryCacheRuntime::Barriers(bool is_prebarrier) { .srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT, .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT, }; + impl->scheduler.RequestOutsideRenderPassOperationContext(); if (is_prebarrier) { impl->scheduler.Record([](vk::CommandBuffer cmdbuf) { cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, diff --git a/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp b/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp index ae9f1de64..7746a88d3 100644 --- a/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp @@ -19,7 +19,7 @@ VkAttachmentDescription AttachmentDescription(const Device& device, PixelFormat VkSampleCountFlagBits samples) { using MaxwellToVK::SurfaceFormat; return { - .flags = VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT, + .flags = {}, .format = SurfaceFormat(device, FormatType::Optimal, true, format).format, .samples = samples, .loadOp = VK_ATTACHMENT_LOAD_OP_LOAD, |