- fix for the infernal context loss + reset issues on holographic

mlfarrell · Jan 6, 2017 · a1795af · a1795af
1 parent e632b69
commit a1795af
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicNativeWindow.cpp
@@ -49,11 +49,20 @@ __declspec(dllexport) ComPtr<ABI::Windows::Perception::IPerceptionTimestamp> Ang
 namespace rx
 {
 
+//"global" camera tracking state - mlf
+static std::vector<ComPtr<ABI::Windows::Graphics::Holographic::IHolographicCamera>> gHolographicCameras;
+
 bool HolographicNativeWindow::mInitialized = false;
 
 HolographicNativeWindow::~HolographicNativeWindow()
 {
     unregisterForHolographicCameraEvents();
+
+    gHolographicCameras.clear();
+    for(auto &swapChain : mHolographicCameras)
+    {
+      gHolographicCameras.push_back(swapChain.second->GetHolographicCamera());
+    }
 }
 
 bool HolographicNativeWindow::initialize(EGLNativeWindowType holographicSpace, IPropertySet *propertySet)
@@ -491,6 +500,24 @@ HRESULT HolographicNativeWindow::getPreferredDeviceFeatureSupport()
     return hr;
 }
 
+void HolographicNativeWindow::setRenderer11(Renderer11 *renderer)
+{
+  mRenderer = renderer;
+
+  // In the case of full context loss, we may be spun up with a holographic space that already has existing cameras
+  // adding those here - mlf
+  {
+    std::lock_guard<std::mutex> locker(mHolographicCamerasLock);
+    for(auto holographicCamera : gHolographicCameras)
+    {
+      UINT32 id;
+      (void)holographicCamera->get_Id(&id);
+      HANDLE shareHandle = (void*)0;
+      mHolographicCameras[id] = std::make_unique<HolographicSwapChain11>(mRenderer, this, shareHandle, holographicCamera.Get());
+    }
+  }
+}
+
 // Initializes the HolographicSpace.
 HRESULT HolographicNativeWindow::setD3DDevice(ID3D11Device *device)
 {

diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicNativeWindow.h b/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicNativeWindow.h
@@ -83,7 +83,7 @@ class HolographicNativeWindow : public InspectableNativeWindow, public std::enab
 
     static bool IsInitialized() { return mInitialized; }
 
-    void setRenderer11(Renderer11* renderer) { mRenderer = renderer; };
+    void setRenderer11(Renderer11* renderer);
     HRESULT setD3DDevice(ID3D11Device *device);
 
     void addHolographicCamera(ABI::Windows::Graphics::Holographic::IHolographicCamera *holographicCamera);

diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicSwapChain11.h b/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicSwapChain11.h
@@ -101,6 +101,9 @@ class HolographicSwapChain11 : public SwapChainD3D
     float const& GetFarPlane()          const { return mFarPlaneDistance;  }
     float const* GetDepthWeightArray()  const { return mDepthWeightArray;  }
 
+    //-mlf
+    inline ComPtr<ABI::Windows::Graphics::Holographic::IHolographicCamera> GetHolographicCamera() { return mHolographicCamera; }
+
   private:
 
     EGLint      resetOffscreenBuffers(