From fe1e86d35a00cb49b75ba79c5bd28d905f0bd8eb Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 4 Oct 2016 19:46:50 +0200
Subject: [PATCH] Fill out pipeline state with API pipelines

---
 qrenderdoc/Code/CaptureContext.cpp | 8 ++++++--
 qrenderdoc/Code/CaptureContext.h   | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/qrenderdoc/Code/CaptureContext.cpp b/qrenderdoc/Code/CaptureContext.cpp
index 2c5aa4b5d..cc6f0ca84 100644
--- a/qrenderdoc/Code/CaptureContext.cpp
+++ b/qrenderdoc/Code/CaptureContext.cpp
@@ -160,9 +160,11 @@ void CaptureContext::LoadLogfile(int proxyRenderer, QString replayHost, QString
     postloadProgress = 0.9f;
 
     r->GetD3D11PipelineState(&CurD3D11PipelineState);
+    r->GetD3D12PipelineState(&CurD3D12PipelineState);
     r->GetGLPipelineState(&CurGLPipelineState);
     r->GetVulkanPipelineState(&CurVulkanPipelineState);
-    // CurPipelineState.SetStates(m_APIProps, CurD3D11PipelineState, CurGLPipelineState);
+    CurPipelineState.SetStates(m_APIProps, &CurD3D11PipelineState, &CurD3D12PipelineState,
+                               &CurGLPipelineState, &CurVulkanPipelineState);
 
     UnreadMessageCount = 0;
     AddMessages(m_FrameInfo.debugMessages);
@@ -195,9 +197,11 @@ void CaptureContext::SetEventID(ILogViewerForm *exclude, uint32_t eventID)
   m_Renderer.BlockInvoke([eventID, this](IReplayRenderer *r) {
     r->SetFrameEvent(eventID, false);
     r->GetD3D11PipelineState(&CurD3D11PipelineState);
+    r->GetD3D12PipelineState(&CurD3D12PipelineState);
     r->GetGLPipelineState(&CurGLPipelineState);
     r->GetVulkanPipelineState(&CurVulkanPipelineState);
-    // CurPipelineState.SetStates(m_APIProps, CurD3D11PipelineState, CurGLPipelineState);
+    CurPipelineState.SetStates(m_APIProps, &CurD3D11PipelineState, &CurD3D12PipelineState,
+                               &CurGLPipelineState, &CurVulkanPipelineState);
   });
 
   for(ILogViewerForm *logviewer : m_LogViewers)
diff --git a/qrenderdoc/Code/CaptureContext.h b/qrenderdoc/Code/CaptureContext.h
index c21b86b9a..342eacfe8 100644
--- a/qrenderdoc/Code/CaptureContext.h
+++ b/qrenderdoc/Code/CaptureContext.h
@@ -124,6 +124,7 @@ public:
   void *FillWindowingData(WId widget);
 
   D3D11PipelineState CurD3D11PipelineState;
+  D3D12PipelineState CurD3D12PipelineState;
   GLPipelineState CurGLPipelineState;
   VulkanPipelineState CurVulkanPipelineState;
   CommonPipelineState CurPipelineState;