diff --git a/CMakeLists.txt b/CMakeLists.txt
index b96a888f954c8..fe869d8779120 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -372,7 +372,7 @@ set_option(SDL_ASAN                "Use AddressSanitizer to detect memory errors
 set_option(SDL_CCACHE              "Use Ccache to speed up build" OFF)
 set_option(SDL_CLANG_TIDY          "Run clang-tidy static analysis" OFF)
 set_option(SDL_GPU_DXVK            "Build SDL_GPU with DXVK support" OFF)
-set_option(SDL_GPU_OPENXR          "Build SDL_GPU with OpenXR support" ON)
+set_option(SDL_GPU_OPENXR          "Build SDL_GPU with OpenXR support" OFF)
 
 set(SDL_VENDOR_INFO "" CACHE STRING "Vendor name and/or version to add to SDL_REVISION")
 
diff --git a/src/gpu/vulkan/SDL_gpu_vulkan.c b/src/gpu/vulkan/SDL_gpu_vulkan.c
index 6cf391d6dc083..e7dcea0431b4a 100644
--- a/src/gpu/vulkan/SDL_gpu_vulkan.c
+++ b/src/gpu/vulkan/SDL_gpu_vulkan.c
@@ -11303,7 +11303,7 @@ static Uint8 VULKAN_INTERNAL_CreateXRInstance(VulkanRenderer *renderer, XrVersio
             &renderer->supportsDebugUtils,
             &renderer->supportsColorspace)) {
         SDL_stack_free((char *)instanceExtensionNames);
-        SET_STRING_ERROR_AND_RETURN("Required Vulkan instance extensions not supported", false)
+        SET_STRING_ERROR_AND_RETURN("Required Vulkan instance extensions not supported", false);
     }
 
     if (renderer->supportsDebugUtils) {
@@ -11364,7 +11364,7 @@ static Uint8 VULKAN_INTERNAL_CreateXRInstance(VulkanRenderer *renderer, XrVersio
     SDL_stack_free((char *)instanceExtensionNames);
 
     if (vulkanResult != VK_SUCCESS) {
-        CHECK_VULKAN_ERROR_AND_RETURN(vulkanResult, vkCreateInstance, 0)
+        CHECK_VULKAN_ERROR_AND_RETURN(vulkanResult, vkCreateInstance, 0);
     }
 
     return 1;
@@ -11904,7 +11904,7 @@ static Uint8 VULKAN_INTERNAL_CreateXRLogicalDevice(
     }
 
     SDL_stack_free((void *)deviceExtensions);
-    CHECK_VULKAN_ERROR_AND_RETURN(vulkanResult, vkCreateDevice, 0)
+    CHECK_VULKAN_ERROR_AND_RETURN(vulkanResult, vkCreateDevice, 0);
 
     // Load vkDevice entry points
 
@@ -12269,7 +12269,7 @@ static bool VULKAN_CreateXRDevice(SDL_GPUDevice **gpu_device, XrInstance *xrInst
         SDL_Vulkan_UnloadLibrary();
         SDL_OPENXR_UnloadLoaderSymbols();
         SDL_free(renderer->xr);
-        SET_STRING_ERROR_AND_RETURN("Failed to initialize Vulkan!", false)
+        SET_STRING_ERROR_AND_RETURN("Failed to initialize Vulkan!", false);
     }
 
     SDL_LogInfo(SDL_LOG_CATEGORY_GPU, "SDL_GPU Driver: Vulkan");
@@ -12299,7 +12299,7 @@ static bool VULKAN_CreateXRDevice(SDL_GPUDevice **gpu_device, XrInstance *xrInst
         SDL_Vulkan_UnloadLibrary();
         SDL_OPENXR_UnloadLoaderSymbols();
         SDL_free(renderer->xr);
-        SET_STRING_ERROR_AND_RETURN("Failed to create logical device!", false)
+        SET_STRING_ERROR_AND_RETURN("Failed to create logical device!", false);
     }
 
     // FIXME: just move this into this function
@@ -12381,7 +12381,7 @@ static bool VULKAN_CreateXRDevice(SDL_GPUDevice **gpu_device, XrInstance *xrInst
         VULKAN_INTERNAL_CommandPoolHashFunction,
         VULKAN_INTERNAL_CommandPoolHashKeyMatch,
         VULKAN_INTERNAL_CommandPoolHashNuke,
-        false);
+        false, false);
 
     renderer->renderPassHashTable = SDL_CreateHashTable(
         (void *)renderer,
@@ -12389,7 +12389,7 @@ static bool VULKAN_CreateXRDevice(SDL_GPUDevice **gpu_device, XrInstance *xrInst
         VULKAN_INTERNAL_RenderPassHashFunction,
         VULKAN_INTERNAL_RenderPassHashKeyMatch,
         VULKAN_INTERNAL_RenderPassHashNuke,
-        false);
+        false, false);
 
     renderer->framebufferHashTable = SDL_CreateHashTable(
         (void *)renderer,
@@ -12397,7 +12397,7 @@ static bool VULKAN_CreateXRDevice(SDL_GPUDevice **gpu_device, XrInstance *xrInst
         VULKAN_INTERNAL_FramebufferHashFunction,
         VULKAN_INTERNAL_FramebufferHashKeyMatch,
         VULKAN_INTERNAL_FramebufferHashNuke,
-        false);
+        false, false);
 
     renderer->graphicsPipelineResourceLayoutHashTable = SDL_CreateHashTable(
         (void *)renderer,
@@ -12405,7 +12405,7 @@ static bool VULKAN_CreateXRDevice(SDL_GPUDevice **gpu_device, XrInstance *xrInst
         VULKAN_INTERNAL_GraphicsPipelineResourceLayoutHashFunction,
         VULKAN_INTERNAL_GraphicsPipelineResourceLayoutHashKeyMatch,
         VULKAN_INTERNAL_GraphicsPipelineResourceLayoutHashNuke,
-        false);
+        false, false);
 
     renderer->computePipelineResourceLayoutHashTable = SDL_CreateHashTable(
         (void *)renderer,
@@ -12413,7 +12413,7 @@ static bool VULKAN_CreateXRDevice(SDL_GPUDevice **gpu_device, XrInstance *xrInst
         VULKAN_INTERNAL_ComputePipelineResourceLayoutHashFunction,
         VULKAN_INTERNAL_ComputePipelineResourceLayoutHashKeyMatch,
         VULKAN_INTERNAL_ComputePipelineResourceLayoutHashNuke,
-        false);
+        false, false);
 
     renderer->descriptorSetLayoutHashTable = SDL_CreateHashTable(
         (void *)renderer,
@@ -12421,7 +12421,7 @@ static bool VULKAN_CreateXRDevice(SDL_GPUDevice **gpu_device, XrInstance *xrInst
         VULKAN_INTERNAL_DescriptorSetLayoutHashFunction,
         VULKAN_INTERNAL_DescriptorSetLayoutHashKeyMatch,
         VULKAN_INTERNAL_DescriptorSetLayoutHashNuke,
-        false);
+        false, false);
 
     // Initialize fence pool