From 8a7ad391e6a83c68420a2d3aaa87c8b120e05ba6 Mon Sep 17 00:00:00 2001 From: xbzk Date: Thu, 4 Jun 2026 09:18:04 -0300 Subject: [PATCH] [vk, renderdoc] (VUID-02997) avoid vk_image_view as VK_NULL_HANDLE when feature nullDescriptor is unavailable --- src/video_core/renderer_vulkan/pipeline_helper.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/video_core/renderer_vulkan/pipeline_helper.h b/src/video_core/renderer_vulkan/pipeline_helper.h index 451a02c7e6..e404ed06a8 100644 --- a/src/video_core/renderer_vulkan/pipeline_helper.h +++ b/src/video_core/renderer_vulkan/pipeline_helper.h @@ -194,7 +194,11 @@ inline void PushImageDescriptors(TextureCache& texture_cache, const VideoCommon::ImageViewId image_view_id{(views++)->id}; const VideoCommon::SamplerId sampler_id{*(samplers++)}; ImageView& image_view{texture_cache.GetImageView(image_view_id)}; - const VkImageView vk_image_view{image_view.Handle(desc.type)}; + VkImageView vk_image_view{image_view.Handle(desc.type)}; + if (vk_image_view == VK_NULL_HANDLE) { + const VkImageView null_image_view{texture_cache.GetImageView(VideoCommon::NULL_IMAGE_VIEW_ID).Handle(desc.type)}; + if (null_image_view != VK_NULL_HANDLE) vk_image_view = null_image_view; + } const Sampler& sampler{texture_cache.GetSampler(sampler_id)}; const bool use_fallback_sampler{sampler.HasAddedAnisotropy() && !image_view.SupportsAnisotropy()};