[Bf-blender-cvs] [c9a4c295895] xr-controller-support: Cleanup: remove unnecessary #ifdefs

[Peter Kim]

Commit: c9a4c2958953d073239143f8ef6612db60aac5d0
Author: Peter Kim
Date:   Thu Aug 26 18:36:29 2021 +0900
Branches: xr-controller-support
https://developer.blender.org/rBc9a4c2958953d073239143f8ef6612db60aac5d0

Cleanup: remove unnecessary #ifdefs

===================================================================

M	intern/ghost/intern/GHOST_XrContext.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_XrContext.cpp b/intern/ghost/intern/GHOST_XrContext.cpp
index 069dc789eea..a359bdefe15 100644
--- a/intern/ghost/intern/GHOST_XrContext.cpp
+++ b/intern/ghost/intern/GHOST_XrContext.cpp
@@ -411,20 +411,12 @@ void GHOST_XrContext::getExtensionsToEnable(
   }
 
   /* Try enabling interaction profile extensions. */
-#ifdef XR_EXT_hp_mixed_reality_controller
   try_ext.push_back(XR_EXT_HP_MIXED_REALITY_CONTROLLER_EXTENSION_NAME);
-#endif
-#ifdef XR_HTC_vive_cosmos_controller_interaction
   try_ext.push_back(XR_HTC_VIVE_COSMOS_CONTROLLER_INTERACTION_EXTENSION_NAME);
-#endif
-#ifdef XR_HUAWEI_controller_interaction
   try_ext.push_back(XR_HUAWEI_CONTROLLER_INTERACTION_EXTENSION_NAME);
-#endif
 
   /* Try enabling controller model extension. */
-#ifdef XR_MSFT_controller_model
   try_ext.push_back(XR_MSFT_CONTROLLER_MODEL_EXTENSION_NAME);
-#endif
 
   r_ext_names.reserve(try_ext.size() + graphics_binding_types.size());
 
@@ -626,13 +618,11 @@ bool GHOST_XrContext::isDebugTimeMode() const
 
 bool GHOST_XrContext::isControllerModelExtensionEnabled() const
 {
-#ifdef XR_MSFT_controller_model
   for (const char *ext_name : m_enabled_extensions) {
     if (strcmp(ext_name, XR_MSFT_CONTROLLER_MODEL_EXTENSION_NAME) == 0) {
       return true;
     }
   }
-#endif
   return false;
 }