From 8c05a52a653412ff5ef603008582bd87d3ad089d Mon Sep 17 00:00:00 2001 From: GPUCode Date: Fri, 18 Aug 2023 22:17:29 +0300 Subject: [PATCH] vk_rasterizer: Correct special unbind --- src/video_core/renderer_vulkan/vk_rasterizer.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 5d83448c7..fdbb11a2a 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -114,10 +114,12 @@ RasterizerVulkan::RasterizerVulkan(Memory::MemorySystem& memory, pipeline_cache.BindTexelBuffer(4, *texture_rgba_view); Surface& null_surface = res_cache.GetSurface(VideoCore::NULL_SURFACE_ID); + Surface& null_cube_surface = res_cache.GetSurface(VideoCore::NULL_SURFACE_CUBE_ID); Sampler& null_sampler = res_cache.GetSampler(VideoCore::NULL_SAMPLER_ID); - for (u32 i = 0; i < 4; i++) { + for (u32 i = 0; i < 3; i++) { pipeline_cache.BindTexture(i, null_surface.ImageView(), null_sampler.Handle()); } + pipeline_cache.BindTexture(3, null_cube_surface.ImageView(), null_sampler.Handle()); for (u32 i = 0; i < 7; i++) { pipeline_cache.BindStorageImage(i, null_surface.StorageView()); @@ -653,11 +655,12 @@ bool RasterizerVulkan::IsFeedbackLoop(u32 texture_index, const Framebuffer* fram } void RasterizerVulkan::UnbindSpecial() { - const Surface& null_surface = res_cache.GetSurface(VideoCore::NULL_SURFACE_ID); + Surface& null_surface = res_cache.GetSurface(VideoCore::NULL_SURFACE_ID); + const Surface& null_cube_surface = res_cache.GetSurface(VideoCore::NULL_SURFACE_CUBE_ID); const Sampler& null_sampler = res_cache.GetSampler(VideoCore::NULL_SAMPLER_ID); - pipeline_cache.BindTexture(3, null_surface.ImageView(), null_sampler.Handle()); + pipeline_cache.BindTexture(3, null_cube_surface.ImageView(), null_sampler.Handle()); for (u32 i = 0; i < 7; i++) { - pipeline_cache.BindStorageImage(i, null_surface.ImageView()); + pipeline_cache.BindStorageImage(i, null_surface.StorageView()); } }