From 4dd1608950621be3d07067904f1006c27b198e7c Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Thu, 21 Oct 2021 13:48:40 -0500 Subject: [PATCH] st/oxr: Update extension support header for D3D11 --- scripts/generate_oxr_ext_support.py | 1 + src/xrt/state_trackers/oxr/oxr_extension_support.h | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/scripts/generate_oxr_ext_support.py b/scripts/generate_oxr_ext_support.py index d8707a7b8..1094cb228 100755 --- a/scripts/generate_oxr_ext_support.py +++ b/scripts/generate_oxr_ext_support.py @@ -17,6 +17,7 @@ EXTENSIONS = ( ['XR_KHR_composition_layer_equirect', 'XRT_FEATURE_OPENXR_LAYER_EQUIRECT1'], ['XR_KHR_composition_layer_equirect2', 'XRT_FEATURE_OPENXR_LAYER_EQUIRECT2'], ['XR_KHR_convert_timespec_time', 'XR_USE_TIMESPEC'], + ['XR_KHR_D3D11_enable', 'XR_USE_GRAPHICS_API_D3D11'], ['XR_KHR_loader_init', 'XR_USE_PLATFORM_ANDROID'], ['XR_KHR_loader_init_android', 'OXR_HAVE_KHR_loader_init', 'XR_USE_PLATFORM_ANDROID'], ['XR_KHR_opengl_enable', 'XR_USE_GRAPHICS_API_OPENGL'], diff --git a/src/xrt/state_trackers/oxr/oxr_extension_support.h b/src/xrt/state_trackers/oxr/oxr_extension_support.h index 369be28f8..a46ac5392 100644 --- a/src/xrt/state_trackers/oxr/oxr_extension_support.h +++ b/src/xrt/state_trackers/oxr/oxr_extension_support.h @@ -17,6 +17,7 @@ #pragma once #include "xrt/xrt_config_build.h" +#include "xrt/xrt_openxr_includes.h" // beginning of GENERATED defines - do not modify - used by scripts @@ -100,6 +101,17 @@ #endif +/* + * XR_KHR_D3D11_enable + */ +#if defined(XR_KHR_D3D11_enable) && defined(XR_USE_GRAPHICS_API_D3D11) +#define OXR_HAVE_KHR_D3D11_enable +#define OXR_EXTENSION_SUPPORT_KHR_D3D11_enable(_) _(KHR_D3D11_enable, KHR_D3D11_ENABLE) +#else +#define OXR_EXTENSION_SUPPORT_KHR_D3D11_enable(_) +#endif + + /* * XR_KHR_loader_init */ @@ -298,6 +310,7 @@ OXR_EXTENSION_SUPPORT_KHR_composition_layer_equirect(_) \ OXR_EXTENSION_SUPPORT_KHR_composition_layer_equirect2(_) \ OXR_EXTENSION_SUPPORT_KHR_convert_timespec_time(_) \ + OXR_EXTENSION_SUPPORT_KHR_D3D11_enable(_) \ OXR_EXTENSION_SUPPORT_KHR_loader_init(_) \ OXR_EXTENSION_SUPPORT_KHR_loader_init_android(_) \ OXR_EXTENSION_SUPPORT_KHR_opengl_enable(_) \