From 7c285be9e8ea031c64c697ba64ccd3dd17da77c4 Mon Sep 17 00:00:00 2001 From: Christoph Haag Date: Fri, 27 Aug 2021 02:34:29 +0200 Subject: [PATCH] st/oxr: Support XR_SWAPCHAIN_USAGE_INPUT_ATTACHMENT_BIT_KHR Trivial, because XR_SWAPCHAIN_USAGE_INPUT_ATTACHMENT_BIT_MND and XR_SWAPCHAIN_USAGE_INPUT_ATTACHMENT_BIT_KHR enum values are aliased. --- src/xrt/state_trackers/oxr/oxr_api_swapchain.c | 6 ++++-- src/xrt/state_trackers/oxr/oxr_swapchain.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/xrt/state_trackers/oxr/oxr_api_swapchain.c b/src/xrt/state_trackers/oxr/oxr_api_swapchain.c index 254502109..9677b4fd7 100644 --- a/src/xrt/state_trackers/oxr/oxr_api_swapchain.c +++ b/src/xrt/state_trackers/oxr/oxr_api_swapchain.c @@ -72,8 +72,10 @@ oxr_xrCreateSwapchain(XrSession session, const XrSwapchainCreateInfo *createInfo flags |= XR_SWAPCHAIN_USAGE_TRANSFER_DST_BIT; flags |= XR_SWAPCHAIN_USAGE_SAMPLED_BIT; flags |= XR_SWAPCHAIN_USAGE_MUTABLE_FORMAT_BIT; - if (inst->extensions.MND_swapchain_usage_input_attachment_bit) { - flags |= XR_SWAPCHAIN_USAGE_INPUT_ATTACHMENT_BIT_MND; + if (inst->extensions.MND_swapchain_usage_input_attachment_bit || + inst->extensions.KHR_swapchain_usage_input_attachment_bit) { + // aliased to XR_SWAPCHAIN_USAGE_INPUT_ATTACHMENT_BIT_MND + flags |= XR_SWAPCHAIN_USAGE_INPUT_ATTACHMENT_BIT_KHR; } if ((createInfo->usageFlags & ~flags) != 0) { diff --git a/src/xrt/state_trackers/oxr/oxr_swapchain.c b/src/xrt/state_trackers/oxr/oxr_swapchain.c index fc23493b8..f6eac9369 100644 --- a/src/xrt/state_trackers/oxr/oxr_swapchain.c +++ b/src/xrt/state_trackers/oxr/oxr_swapchain.c @@ -179,7 +179,8 @@ convert_usage_bits(XrSwapchainUsageFlags xr_usage) if ((xr_usage & XR_SWAPCHAIN_USAGE_MUTABLE_FORMAT_BIT) != 0) { usage |= XRT_SWAPCHAIN_USAGE_MUTABLE_FORMAT; } - if ((xr_usage & XR_SWAPCHAIN_USAGE_INPUT_ATTACHMENT_BIT_MND) != 0) { + // aliased to XR_SWAPCHAIN_USAGE_INPUT_ATTACHMENT_BIT_MND + if ((xr_usage & XR_SWAPCHAIN_USAGE_INPUT_ATTACHMENT_BIT_KHR) != 0) { usage |= XRT_SWAPCHAIN_USAGE_INPUT_ATTACHMENT; }