DestroyOpenXRDebugUtilsMessenger: return XrResult

DiligentGraphics · Dec 16, 2024 · 969047c · 969047c
1 parent 1560ed3
commit 969047c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Graphics/GraphicsTools/interface/OpenXRUtilities.h b/Graphics/GraphicsTools/interface/OpenXRUtilities.h
@@ -68,7 +68,7 @@ XrDebugUtilsMessengerEXT DILIGENT_GLOBAL_FUNCTION(CreateOpenXRDebugUtilsMessenge
     XrDebugUtilsMessageSeverityFlagsEXT xrMessageSeverities);
 
 /// Destroys OpenXR debug utils messenger.
-void DILIGENT_GLOBAL_FUNCTION(DestroyOpenXRDebugUtilsMessenger)(XrDebugUtilsMessengerEXT xrDebugUtilsMessenger);
+XrResult DILIGENT_GLOBAL_FUNCTION(DestroyOpenXRDebugUtilsMessenger)(XrDebugUtilsMessengerEXT xrDebugUtilsMessenger);
 
 /// Allocates OpenXR swapchain image data, i.e. an array of appropriate structures for each device
 /// type (XrSwapchainImageVulkanKHR, XrSwapchainImageD3D11KHR, etc.).

diff --git a/Graphics/GraphicsTools/src/OpenXRUtilities.cpp b/Graphics/GraphicsTools/src/OpenXRUtilities.cpp
@@ -343,12 +343,14 @@ XrDebugUtilsMessengerEXT CreateOpenXRDebugUtilsMessenger(XrInstance
     return debugUtilsMessenger;
 }
 
-void DestroyOpenXRDebugUtilsMessenger(XrDebugUtilsMessengerEXT debugUtilsMessenger)
+XrResult DestroyOpenXRDebugUtilsMessenger(XrDebugUtilsMessengerEXT debugUtilsMessenger)
 {
+    XrResult Res = XR_ERROR_FUNCTION_UNSUPPORTED;
     if (xrDestroyDebugUtilsMessengerEXT)
     {
-        xrDestroyDebugUtilsMessengerEXT(debugUtilsMessenger);
+        Res = xrDestroyDebugUtilsMessengerEXT(debugUtilsMessenger);
     }
+    return Res;
 }
 
 } // namespace Diligent