From eb7159a8595e259885b843586d2967e00c1071c3 Mon Sep 17 00:00:00 2001
From: CamilleLaVey <camillelavey99@gmail.com>
Date: Sat, 29 Nov 2025 12:30:25 -0400
Subject: [PATCH] [vk] NullDescriptor guard

---
 src/video_core/renderer_vulkan/vk_buffer_cache.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp
index 6912e315d8..f4af76e310 100644
--- a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp
@@ -594,6 +594,12 @@ void BufferCacheRuntime::BindVertexBuffer(u32 index, VkBuffer buffer, u32 offset
     if (index >= device.GetMaxVertexInputBindings()) {
         return;
     }
+    if (!device.HasNullDescriptor() && buffer == VK_NULL_HANDLE) {
+        ReserveNullBuffer();
+        buffer = *null_buffer;
+        offset = 0;
+        size = VK_WHOLE_SIZE;
+    }
     // Use BindVertexBuffers2EXT only if EDS1 is supported AND VIDS is not active
     // When VIDS is active, the pipeline doesn't declare VERTEX_INPUT_BINDING_STRIDE as dynamic
     if (device.IsExtExtendedDynamicStateSupported() && !device.IsExtVertexInputDynamicStateSupported()) {