Skip to content

Commit 969047c

Browse files
DestroyOpenXRDebugUtilsMessenger: return XrResult
1 parent 1560ed3 commit 969047c

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Graphics/GraphicsTools/interface/OpenXRUtilities.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ XrDebugUtilsMessengerEXT DILIGENT_GLOBAL_FUNCTION(CreateOpenXRDebugUtilsMessenge
6868
XrDebugUtilsMessageSeverityFlagsEXT xrMessageSeverities);
6969

7070
/// Destroys OpenXR debug utils messenger.
71-
void DILIGENT_GLOBAL_FUNCTION(DestroyOpenXRDebugUtilsMessenger)(XrDebugUtilsMessengerEXT xrDebugUtilsMessenger);
71+
XrResult DILIGENT_GLOBAL_FUNCTION(DestroyOpenXRDebugUtilsMessenger)(XrDebugUtilsMessengerEXT xrDebugUtilsMessenger);
7272

7373
/// Allocates OpenXR swapchain image data, i.e. an array of appropriate structures for each device
7474
/// type (XrSwapchainImageVulkanKHR, XrSwapchainImageD3D11KHR, etc.).

Graphics/GraphicsTools/src/OpenXRUtilities.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,12 +343,14 @@ XrDebugUtilsMessengerEXT CreateOpenXRDebugUtilsMessenger(XrInstance
343343
return debugUtilsMessenger;
344344
}
345345

346-
void DestroyOpenXRDebugUtilsMessenger(XrDebugUtilsMessengerEXT debugUtilsMessenger)
346+
XrResult DestroyOpenXRDebugUtilsMessenger(XrDebugUtilsMessengerEXT debugUtilsMessenger)
347347
{
348+
XrResult Res = XR_ERROR_FUNCTION_UNSUPPORTED;
348349
if (xrDestroyDebugUtilsMessengerEXT)
349350
{
350-
xrDestroyDebugUtilsMessengerEXT(debugUtilsMessenger);
351+
Res = xrDestroyDebugUtilsMessengerEXT(debugUtilsMessenger);
351352
}
353+
return Res;
352354
}
353355

354356
} // namespace Diligent

0 commit comments

Comments
 (0)