From d95bc52642f840e2b7cd6c2f618a775d79486780 Mon Sep 17 00:00:00 2001
From: Evan Hemsley <evan@moonside.games>
Date: Wed, 20 May 2026 11:55:06 -0700
Subject: [PATCH] Fix validation errors

---
 src/gpu/vulkan/SDL_gpu_vulkan.c         | 8 +++++++-
 src/gpu/vulkan/SDL_gpu_vulkan_vkfuncs.h | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/gpu/vulkan/SDL_gpu_vulkan.c b/src/gpu/vulkan/SDL_gpu_vulkan.c
index 3cfbf2df84..fb1f28fab5 100644
--- a/src/gpu/vulkan/SDL_gpu_vulkan.c
+++ b/src/gpu/vulkan/SDL_gpu_vulkan.c
@@ -7140,7 +7140,7 @@ static SDL_GPUQueryPool *VULKAN_CreateQueryPool(
 
     vkQueryPoolCreateInfo.sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO;
     vkQueryPoolCreateInfo.pNext = NULL;
-    vkQueryPoolCreateInfo.flags = VK_QUERY_POOL_CREATE_RESET_BIT_KHR;
+    vkQueryPoolCreateInfo.flags = 0;
     vkQueryPoolCreateInfo.pipelineStatistics = 0;
     vkQueryPoolCreateInfo.queryCount = createinfo->query_count;
     vkQueryPoolCreateInfo.queryType = SDLToVK_QueryType[createinfo->type];
@@ -10020,6 +10020,12 @@ static void VULKAN_BeginQuery(
     VulkanRenderer *renderer = vulkanCommandBuffer->renderer;
     VulkanQueryPool *vulkanQueryPool = (VulkanQueryPool *)pool;
 
+    renderer->vkCmdResetQueryPool(
+        vulkanCommandBuffer->commandBuffer,
+        vulkanQueryPool->pool,
+        index,
+        1);
+
     // Timestamp queries don't begin and end, we just need a distinction between
     // a timestamp written when preceding commands are taken and when preceding commands are finished.
     if (vulkanQueryPool->type == SDL_GPU_QUERY_TIMESTAMP) {
diff --git a/src/gpu/vulkan/SDL_gpu_vulkan_vkfuncs.h b/src/gpu/vulkan/SDL_gpu_vulkan_vkfuncs.h
index 8940316dcb..518523311f 100644
--- a/src/gpu/vulkan/SDL_gpu_vulkan_vkfuncs.h
+++ b/src/gpu/vulkan/SDL_gpu_vulkan_vkfuncs.h
@@ -109,6 +109,7 @@ VULKAN_DEVICE_FUNCTION(vkCmdDrawIndirect)
 VULKAN_DEVICE_FUNCTION(vkCmdEndRenderPass)
 VULKAN_DEVICE_FUNCTION(vkCmdEndQuery)
 VULKAN_DEVICE_FUNCTION(vkCmdPipelineBarrier)
+VULKAN_DEVICE_FUNCTION(vkCmdResetQueryPool)
 VULKAN_DEVICE_FUNCTION(vkCmdResolveImage)
 VULKAN_DEVICE_FUNCTION(vkCmdSetBlendConstants)
 VULKAN_DEVICE_FUNCTION(vkCmdSetDepthBias)