OpenXR HP Revergb G2 and Samsung Odyssey interaction profiles

Implemented the HP Revergb G2 and Samsung Odyssey interaction profiles
for WebXR.

Change-Id: Icb80280e5c68e90aadd0f8dda033a41712a18306
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2398917
Commit-Queue: Lachlan Ford <laford@microsoft.com>
Reviewed-by: Rafael Cintron <rafael.cintron@microsoft.com>
Reviewed-by: Alexander Cooper <alcooper@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805536}

device/vr/openxr/openxr_controller.cc

@@ -68,6 +68,7 @@ XrResult OpenXrController::Initialize(
     XrInstance instance,
     XrSession session,
     const OpenXRPathHelper* path_helper,
+    const OpenXrExtensionHelper& extension_helper,
     std::map<XrPath, std::vector<XrActionSuggestedBinding>>* bindings) {
   DCHECK(bindings);
   type_ = type;
@@ -95,7 +96,7 @@ XrResult OpenXrController::Initialize(
 
   RETURN_IF_XR_FAILED(InitializeControllerActions());
 
-  SuggestBindings(bindings);
+  SuggestBindings(extension_helper, bindings);
   RETURN_IF_XR_FAILED(InitializeControllerSpaces());
 
   return XR_SUCCESS;
@@ -132,10 +133,23 @@ XrResult OpenXrController::InitializeControllerActions() {
 }
 
 XrResult OpenXrController::SuggestBindings(
+    const OpenXrExtensionHelper& extension_helper,
     std::map<XrPath, std::vector<XrActionSuggestedBinding>>* bindings) const {
   const std::string binding_prefix = GetTopLevelUserPath(type_);
 
   for (auto interaction_profile : kOpenXrControllerInteractionProfiles) {
+    // If the interaction profile is defined by an extension, check it here,
+    // otherwise continue
+    const bool extension_required =
+        interaction_profile.required_extension != nullptr;
+    if (extension_required) {
+      const bool extension_enabled = extension_helper.ExtensionSupported(
+          interaction_profile.required_extension);
+      if (!extension_enabled) {
+        continue;
+      }
+    }
+
     XrPath interaction_profile_path =
         path_helper_->GetInteractionProfileXrPath(interaction_profile.type);
     RETURN_IF_XR_FAILED(SuggestActionBinding(

device/vr/openxr/openxr_controller.h

@@ -34,6 +34,7 @@ class OpenXrController {
       XrInstance instance,
       XrSession session,
       const OpenXRPathHelper* path_helper,
+      const OpenXrExtensionHelper& extension_helper,
       std::map<XrPath, std::vector<XrActionSuggestedBinding>>* bindings);
 
   XrActionSet action_set() const { return action_set_; }
@@ -61,6 +62,7 @@ class OpenXrController {
   XrResult InitializeControllerSpaces();
 
   XrResult SuggestBindings(
+      const OpenXrExtensionHelper& extension_helper,
       std::map<XrPath, std::vector<XrActionSuggestedBinding>>* bindings) const;
 
   XrResult CreateActionsForButton(OpenXrButtonType button_type);

device/vr/openxr/openxr_defs.h

@@ -9,6 +9,11 @@ namespace device {
 constexpr char kWin32AppcontainerCompatibleExtensionName[] =
     "XR_EXT_win32_appcontainer_compatible";
 
+constexpr char kExtSamsungOdysseyControllerExtensionName[] =
+    "XR_EXT_samsung_odyssey_controller";
+constexpr char kExtHPMixedRealityControllerExtensionName[] =
+    "XR_EXT_hp_mixed_reality_controller";
+
 }  // namespace device
 
 #endif  // DEVICE_VR_OPENXR_OPENXR_DEFS_H_

device/vr/openxr/openxr_input_helper.cc

@@ -122,10 +122,11 @@ XrResult OpenXRInputHelper::Initialize(XrInstance instance) {
   // on availability.
   std::map<XrPath, std::vector<XrActionSuggestedBinding>> bindings;
 
+  OpenXrExtensionHelper extension_helper;
   for (size_t i = 0; i < controller_states_.size(); i++) {
     RETURN_IF_XR_FAILED(controller_states_[i].controller.Initialize(
         static_cast<OpenXrHandednessType>(i), instance, session_,
-        path_helper_.get(), &bindings));
+        path_helper_.get(), extension_helper, &bindings));
     controller_states_[i].primary_button_pressed = false;
   }
 

device/vr/openxr/openxr_interaction_profiles.h

@@ -7,6 +7,7 @@
 
 #include "base/stl_util.h"
 #include "device/gamepad/public/cpp/gamepad.h"
+#include "device/vr/openxr/openxr_defs.h"
 #include "third_party/openxr/src/include/openxr/openxr.h"
 
 namespace device {
@@ -25,7 +26,9 @@ enum class OpenXrInteractionProfileType {
   kOculusTouch = 2,
   kValveIndex = 3,
   kHTCVive = 4,
-  kCount = 5,
+  kSamsungOdyssey = 5,
+  kHPReverbG2 = 6,
+  kCount = 7,
 };
 
 enum class OpenXrButtonType {
@@ -71,6 +74,7 @@ struct OpenXrAxisPathMap {
 struct OpenXrControllerInteractionProfile {
   OpenXrInteractionProfileType type;
   const char* const path;
+  const char* const required_extension;
   GamepadMapping mapping;
   const char* const* const input_profiles;
   const size_t profile_size;
@@ -82,13 +86,14 @@ struct OpenXrControllerInteractionProfile {
   size_t axis_map_size;
 };
 
-// TODO(crbug.com/1017513)
 // Currently Supports:
 // Microsoft motion controller.
+// Samsung Odyssey controller
 // Khronos simple controller.
 // Oculus touch controller.
 // Valve index controller.
 // HTC vive controller
+// HP Reverb G2 controller
 // Declare OpenXR input profile bindings for other runtimes when they become
 // available.
 constexpr const char* kMicrosoftMotionInputProfiles[] = {
@@ -105,6 +110,13 @@ constexpr const char* kValveIndexInputProfiles[] = {
 constexpr const char* kHTCViveInputProfiles[] = {
     "htc-vive", "generic-trigger-squeeze-touchpad"};
 
+constexpr const char* kSamsungOdysseyInputProfiles[] = {
+    "samsung-odyssey", "windows-mixed-reality",
+    "generic-trigger-squeeze-touchpad-thumbstick"};
+
+constexpr const char* kHPReverbG2InputProfiles[] = {
+    "hp-mixed-reality", "oculus-touch", "generic-trigger-squeeze"};
+
 constexpr OpenXrButtonPathMap kMicrosoftMotionControllerButtonPathMaps[] = {
     {OpenXrButtonType::kTrigger,
      {
@@ -205,7 +217,7 @@ constexpr OpenXrButtonPathMap kValveIndexControllerButtonPathMaps[] = {
      {{OpenXrButtonActionType::kPress, "/input/a/click"},
       {OpenXrButtonActionType::kTouch, "/input/a/touch"}},
      2},
-};  // namespace device
+};
 
 constexpr OpenXrButtonPathMap kHTCViveControllerButtonPathMaps[] = {
     {OpenXrButtonType::kTrigger,
@@ -222,6 +234,46 @@ constexpr OpenXrButtonPathMap kHTCViveControllerButtonPathMaps[] = {
       {OpenXrButtonActionType::kTouch, "/input/trackpad/touch"}},
      2}};
 
+constexpr OpenXrButtonPathMap kHPReverbG2LeftControllerButtonPathMaps[] = {
+    {OpenXrButtonType::kTrigger,
+     {{OpenXrButtonActionType::kPress, "/input/trigger/value"},
+      {OpenXrButtonActionType::kValue, "/input/trigger/value"}},
+     2},
+    {OpenXrButtonType::kSqueeze,
+     {{OpenXrButtonActionType::kPress, "/input/squeeze/value"},
+      {OpenXrButtonActionType::kValue, "/input/squeeze/value"}},
+     2},
+    {OpenXrButtonType::kThumbstick,
+     {{OpenXrButtonActionType::kPress, "/input/thumbstick/click"}},
+     1},
+    {OpenXrButtonType::kButton1,
+     {{OpenXrButtonActionType::kPress, "/input/x/click"}},
+     1},
+    {OpenXrButtonType::kButton2,
+     {{OpenXrButtonActionType::kPress, "/input/y/click"}},
+     1},
+};
+
+constexpr OpenXrButtonPathMap kHPReverbG2RightControllerButtonPathMaps[] = {
+    {OpenXrButtonType::kTrigger,
+     {{OpenXrButtonActionType::kPress, "/input/trigger/value"},
+      {OpenXrButtonActionType::kValue, "/input/trigger/value"}},
+     2},
+    {OpenXrButtonType::kSqueeze,
+     {{OpenXrButtonActionType::kPress, "/input/squeeze/value"},
+      {OpenXrButtonActionType::kValue, "/input/squeeze/value"}},
+     2},
+    {OpenXrButtonType::kThumbstick,
+     {{OpenXrButtonActionType::kPress, "/input/thumbstick/click"}},
+     1},
+    {OpenXrButtonType::kButton1,
+     {{OpenXrButtonActionType::kPress, "/input/a/click"}},
+     1},
+    {OpenXrButtonType::kButton2,
+     {{OpenXrButtonActionType::kPress, "/input/b/click"}},
+     1},
+};
+
 constexpr OpenXrAxisPathMap kMicrosoftMotionControllerAxisPathMaps[] = {
     {OpenXrAxisType::kTrackpad, "/input/trackpad"},
     {OpenXrAxisType::kThumbstick, "/input/thumbstick"},
@@ -240,10 +292,15 @@ constexpr OpenXrAxisPathMap kHTCViveControllerAxisPathMaps[] = {
     {OpenXrAxisType::kTrackpad, "/input/trackpad"},
 };
 
+constexpr OpenXrAxisPathMap kHPReverbG2ControllerAxisPathMaps[] = {
+    {OpenXrAxisType::kThumbstick, "/input/thumbstick"},
+};
+
 constexpr OpenXrControllerInteractionProfile
     kMicrosoftMotionInteractionProfile = {
         OpenXrInteractionProfileType::kMicrosoftMotion,
         "/interaction_profiles/microsoft/motion_controller",
+        nullptr,
         GamepadMapping::kXrStandard,
         kMicrosoftMotionInputProfiles,
         base::size(kMicrosoftMotionInputProfiles),
@@ -257,6 +314,7 @@ constexpr OpenXrControllerInteractionProfile
 constexpr OpenXrControllerInteractionProfile kKHRSimpleInteractionProfile = {
     OpenXrInteractionProfileType::kKHRSimple,
     "/interaction_profiles/khr/simple_controller",
+    nullptr,
     GamepadMapping::kNone,
     kGenericButtonInputProfiles,
     base::size(kGenericButtonInputProfiles),
@@ -270,6 +328,7 @@ constexpr OpenXrControllerInteractionProfile kKHRSimpleInteractionProfile = {
 constexpr OpenXrControllerInteractionProfile kOculusTouchInteractionProfile = {
     OpenXrInteractionProfileType::kOculusTouch,
     "/interaction_profiles/oculus/touch_controller",
+    nullptr,
     GamepadMapping::kXrStandard,
     kOculusTouchInputProfiles,
     base::size(kOculusTouchInputProfiles),
@@ -283,6 +342,7 @@ constexpr OpenXrControllerInteractionProfile kOculusTouchInteractionProfile = {
 constexpr OpenXrControllerInteractionProfile kValveIndexInteractionProfile = {
     OpenXrInteractionProfileType::kValveIndex,
     "/interaction_profiles/valve/index_controller",
+    nullptr,
     GamepadMapping::kXrStandard,
     kValveIndexInputProfiles,
     base::size(kValveIndexInputProfiles),
@@ -296,6 +356,7 @@ constexpr OpenXrControllerInteractionProfile kValveIndexInteractionProfile = {
 constexpr OpenXrControllerInteractionProfile kHTCViveInteractionProfile = {
     OpenXrInteractionProfileType::kHTCVive,
     "/interaction_profiles/htc/vive_controller",
+    nullptr,
     GamepadMapping::kXrStandard,
     kHTCViveInputProfiles,
     base::size(kHTCViveInputProfiles),
@@ -306,11 +367,40 @@ constexpr OpenXrControllerInteractionProfile kHTCViveInteractionProfile = {
     kHTCViveControllerAxisPathMaps,
     base::size(kHTCViveControllerAxisPathMaps)};
 
+constexpr OpenXrControllerInteractionProfile kSamsungOdysseyInteractionProfile =
+    {OpenXrInteractionProfileType::kSamsungOdyssey,
+     "/interaction_profiles/samsung/odyssey_controller",
+     kExtSamsungOdysseyControllerExtensionName,
+     GamepadMapping::kXrStandard,
+     kSamsungOdysseyInputProfiles,
+     base::size(kSamsungOdysseyInputProfiles),
+     kMicrosoftMotionControllerButtonPathMaps,
+     base::size(kMicrosoftMotionControllerButtonPathMaps),
+     kMicrosoftMotionControllerButtonPathMaps,
+     base::size(kMicrosoftMotionControllerButtonPathMaps),
+     kMicrosoftMotionControllerAxisPathMaps,
+     base::size(kMicrosoftMotionControllerAxisPathMaps)};
+
+constexpr OpenXrControllerInteractionProfile kHPReverbG2InteractionProfile = {
+    OpenXrInteractionProfileType::kHPReverbG2,
+    "/interaction_profiles/hp/mixed_reality_controller",
+    kExtHPMixedRealityControllerExtensionName,
+    GamepadMapping::kXrStandard,
+    kHPReverbG2InputProfiles,
+    base::size(kHPReverbG2InputProfiles),
+    kHPReverbG2LeftControllerButtonPathMaps,
+    base::size(kHPReverbG2LeftControllerButtonPathMaps),
+    kHPReverbG2RightControllerButtonPathMaps,
+    base::size(kHPReverbG2RightControllerButtonPathMaps),
+    kHPReverbG2ControllerAxisPathMaps,
+    base::size(kHPReverbG2ControllerAxisPathMaps)};
+
 constexpr OpenXrControllerInteractionProfile
     kOpenXrControllerInteractionProfiles[] = {
         kMicrosoftMotionInteractionProfile, kKHRSimpleInteractionProfile,
-        kOculusTouchInteractionProfile, kValveIndexInteractionProfile,
-        kHTCViveInteractionProfile};
+        kOculusTouchInteractionProfile,     kValveIndexInteractionProfile,
+        kHTCViveInteractionProfile,         kSamsungOdysseyInteractionProfile,
+        kHPReverbG2InteractionProfile};
 
 }  // namespace device
 

device/vr/openxr/openxr_util.cc

@@ -70,7 +70,8 @@ OpenXrExtensionHelper::OpenXrExtensionHelper() {
 
 OpenXrExtensionHelper::~OpenXrExtensionHelper() = default;
 
-bool OpenXrExtensionHelper::ExtensionSupported(const char* extension_name) {
+bool OpenXrExtensionHelper::ExtensionSupported(
+    const char* extension_name) const {
   return std::find_if(
              extension_properties_.begin(), extension_properties_.end(),
              [&extension_name](const XrExtensionProperties& properties) {
@@ -134,6 +135,22 @@ XrResult CreateInstance(XrInstance* instance) {
     extensions.push_back(XR_MSFT_UNBOUNDED_REFERENCE_SPACE_EXTENSION_NAME);
   }
 
+  // Input extensions. These enable interaction profiles not defined in the core
+  // spec
+  const bool samsungInteractionProfileExtensionSupported =
+      extension_helper.ExtensionSupported(
+          kExtSamsungOdysseyControllerExtensionName);
+  if (samsungInteractionProfileExtensionSupported) {
+    extensions.push_back(kExtSamsungOdysseyControllerExtensionName);
+  }
+
+  const bool hpControllerExtensionSupported =
+      extension_helper.ExtensionSupported(
+          kExtHPMixedRealityControllerExtensionName);
+  if (hpControllerExtensionSupported) {
+    extensions.push_back(kExtHPMixedRealityControllerExtensionName);
+  }
+
   instance_create_info.enabledExtensionCount =
       static_cast<uint32_t>(extensions.size());
   instance_create_info.enabledExtensionNames = extensions.data();

device/vr/openxr/openxr_util.h

@@ -16,7 +16,7 @@ class OpenXrExtensionHelper {
   OpenXrExtensionHelper();
   ~OpenXrExtensionHelper();
 
-  bool ExtensionSupported(const char* extension_name);
+  bool ExtensionSupported(const char* extension_name) const;
 
  private:
   std::vector<XrExtensionProperties> extension_properties_;