Bug 1299929 - Part 2: Add extra info for VRController; r=kip

MozReview-Commit-ID: 5y8X5ZPnsHb

gfx/vr/VRDisplayHost.cpp

@@ -155,4 +155,22 @@ VRControllerHost::VRControllerHost(VRDeviceType aType)
 VRControllerHost::~VRControllerHost()
 {
   MOZ_COUNT_DTOR(VRControllerHost);
+}
+
+const VRControllerInfo&
+VRControllerHost::GetControllerInfo() const
+{
+  return mControllerInfo;
+}
+
+void
+VRControllerHost::SetIndex(uint32_t aIndex)
+{
+  mIndex = aIndex;
+}
+
+uint32_t
+VRControllerHost::GetIndex()
+{
+  return mIndex;
 }

gfx/vr/VRDisplayHost.h

@@ -87,13 +87,17 @@ class VRControllerHost {
 public:
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VRControllerHost)
 
-  const VRControllerInfo& GetControllerInfo() const { return mControllerInfo; }
+  const VRControllerInfo& GetControllerInfo() const;
+  void SetIndex(uint32_t aIndex);
+  uint32_t GetIndex();
 
 protected:
   explicit VRControllerHost(VRDeviceType aType);
   virtual ~VRControllerHost();
 
   VRControllerInfo mControllerInfo;
+  // The controller index in VRControllerManager.
+  uint32_t mIndex;
 };
 
 } // namespace gfx

gfx/vr/gfxVROpenVR.cpp

@@ -455,6 +455,18 @@ VRControllerOpenVR::~VRControllerOpenVR()
   MOZ_COUNT_DTOR_INHERITED(VRControllerOpenVR, VRControllerHost);
 }
 
+void
+VRControllerOpenVR::SetTrackedIndex(uint32_t aTrackedIndex)
+{
+  mTrackedIndex = aTrackedIndex;
+}
+
+uint32_t
+VRControllerOpenVR::GetTrackedIndex()
+{
+  return mTrackedIndex;
+}
+
 VRControllerManagerOpenVR::VRControllerManagerOpenVR()
   : mOpenVRInstalled(false), mVRSystem(nullptr)
 {
@@ -573,6 +585,8 @@ VRControllerManagerOpenVR::ScanForDevices()
     }
 
     RefPtr<VRControllerOpenVR> openVRController = new VRControllerOpenVR();
+    openVRController->SetIndex(mControllerCount);
+    openVRController->SetTrackedIndex(trackedDevice);
     mOpenVRController.AppendElement(openVRController);
 
     // Not already present, add it.

gfx/vr/gfxVROpenVR.h

@@ -92,9 +92,14 @@ class VRControllerOpenVR : public VRControllerHost
 {
 public:
   explicit VRControllerOpenVR();
+  void SetTrackedIndex(uint32_t aTrackedIndex);
+  uint32_t GetTrackedIndex();
 
 protected:
   virtual ~VRControllerOpenVR();
+
+  // The index of tracked devices from vr::IVRSystem.
+  uint32_t mTrackedIndex;
 };
 
 } // namespace impl