Add all-input-extension enable to main and service

Ensure that overlay applications can access all input profile
extensions. Up to date with 1.0.19.

Author: jzulauf-lunarg

overlay-sample/overlay_sample.cpp

@@ -86,6 +86,12 @@ constexpr int gFudgeMinAlpha = 128;
 int gLayerPlacement = 0;
 float gLayerRotationalOffset = 0.f;
 bool gEmptyFrame = false;
+bool gAllInputExtensions = false;
+
+std::vector<const char*> gInputExtensionList{
+    XR_EXT_SAMSUNG_ODYSSEY_CONTROLLER_EXTENSION_NAME, XR_EXT_HP_MIXED_REALITY_CONTROLLER_EXTENSION_NAME,
+    XR_EXT_EYE_GAZE_INTERACTION_EXTENSION_NAME, XR_HTC_VIVE_COSMOS_CONTROLLER_INTERACTION_EXTENSION_NAME,
+    XR_MSFT_HAND_INTERACTION_EXTENSION_NAME};
 
 // OpenXR will give us a LUID.  This function will walk adapters to find
 // the adapter matching that LUID, then create an ID3D11Device* from it so
@@ -334,6 +340,7 @@ class OpenXRProgram
 void OpenXRProgram::CreateInstance(const std::string& appName, uint32_t appVersion, const std::string& engineName, uint32_t engineVersion)
 {
     std::map<std::string, uint32_t> extensions;
+    auto HasExtension = [&extensions](const char* extName) { return extensions.find(std::string(extName)) != extensions.end(); };
 
     uint32_t extPropCount;
     CHECK_XR(xrEnumerateInstanceExtensionProperties(nullptr, 0, &extPropCount, nullptr));
@@ -353,30 +360,41 @@ void OpenXRProgram::CreateInstance(const std::string& appName, uint32_t appVersi
         std::cout << "Extensions supported:\n";
         for(const auto& p: extensions) {
             std::cout << "    " << p.first << ", version " << p.second << "\n";
-            if(std::string(p.first) == "XR_EXT_debug_utils") {
-                mDebugUtilsAvailable = true;
-            }
-            if(std::string(p.first) == "XR_EXT_permissions_support") {
-                mPermissionsSupportAvailable = true;
-            }
         }
     } else {
         std::cout << "Warning: No extensions supported.\n";
     }
 
     std::vector<const char*> requiredExtensionNames;
-    requiredExtensionNames.push_back("XR_KHR_D3D11_enable");
 
-    if (mRequestOverlaySession) {
-        requiredExtensionNames.push_back(XR_EXTX_OVERLAY_EXTENSION_NAME);
-    }
+    auto RequestExtension = [&HasExtension, &requiredExtensionNames](const char* extName) {
+        if (HasExtension(extName)) {
+            requiredExtensionNames.push_back(extName);
+            return true;
+        }
+        return false;
+    };
 
-    if(mDebugUtilsAvailable) {
-        requiredExtensionNames.push_back("XR_EXT_debug_utils");
+    if (!RequestExtension("XR_KHR_D3D11_enable")) {
+        // Fatal error to not have graphics support
+        std::cerr << "Error: required D3D11 extension not present" << std::endl;
+        exit(1);
     }
 
-    if(mPermissionsSupportAvailable) {
-        requiredExtensionNames.push_back("XR_EXT_permissions_support");
+    if (mRequestOverlaySession) {
+        if (!RequestExtension(XR_EXTX_OVERLAY_EXTENSION_NAME)) {
+            // Fatal error to not have graphics support
+            std::cerr << "Error: cannot start overlay session without overlay extension" << std::endl;
+            exit(1);
+        }
+    }
+    RequestExtension("XR_EXT_debug_utils");
+    RequestExtension("XR_EXT_permissions_support");
+    if (gAllInputExtensions) {
+        // Enable all input extensions that are *present* -- typically when as service
+        for (auto& ext : gInputExtensionList) {
+            RequestExtension(ext);
+        }
     }
 
     XrInstanceCreateInfo createInstance{XR_TYPE_INSTANCE_CREATE_INFO};
@@ -1059,10 +1077,12 @@ int main( int argc, char **argv )
             arg += 2;
         } else if (strcmp(argv[arg], "--main") == 0) {
             createOverlaySession = false;
+            gAllInputExtensions = true;  // Need to support anything an overlay session *could* ask for
             arg += 1;
         } else if (strcmp(argv[arg], "--service") == 0) {
             createOverlaySession = false;
             gEmptyFrame = true;
+            gAllInputExtensions = true;  // Need to support anything an overlay session *could* ask for
             arg += 1;
 
         } else if ((strcmp(argv[arg], "--rotational-offset") == 0) || (strcmp(argv[arg], "--rot") == 0)) {