From 1019b7f2cb4b7a3e42c051ff7100bc4dc49a20ae Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 16 May 2024 15:47:55 +0100
Subject: [PATCH] Fix unwrapping and replay of AddToStateObject

---
 renderdoc/driver/d3d12/d3d12_device_wrap7.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/renderdoc/driver/d3d12/d3d12_device_wrap7.cpp b/renderdoc/driver/d3d12/d3d12_device_wrap7.cpp
index a2325c3d7..166e3488a 100644
--- a/renderdoc/driver/d3d12/d3d12_device_wrap7.cpp
+++ b/renderdoc/driver/d3d12/d3d12_device_wrap7.cpp
@@ -77,7 +77,8 @@ bool WrappedID3D12Device::Serialise_AddToStateObject(SerialiserType &ser,
 
     if(m_pDevice7)
     {
-      hr = m_pDevice7->CreateStateObject(&Addition, guid, (void **)&ret);
+      hr = m_pDevice7->AddToStateObject(&Addition, Unwrap(pStateObjectToGrowFrom), guid,
+                                        (void **)&ret);
     }
     else
     {
@@ -147,12 +148,13 @@ HRESULT STDMETHODCALLTYPE WrappedID3D12Device::AddToStateObject(
     REFIID riid, _COM_Outptr_ void **ppNewStateObject)
 {
   if(pAddition == NULL)
-    return m_pDevice7->AddToStateObject(pAddition, pStateObjectToGrowFrom, riid, ppNewStateObject);
+    return m_pDevice7->AddToStateObject(pAddition, Unwrap(pStateObjectToGrowFrom), riid,
+                                        ppNewStateObject);
 
   D3D12_UNWRAPPED_STATE_OBJECT_DESC unwrappedDesc(*pAddition);
 
   if(ppNewStateObject == NULL)
-    return m_pDevice7->AddToStateObject(&unwrappedDesc, pStateObjectToGrowFrom, riid,
+    return m_pDevice7->AddToStateObject(&unwrappedDesc, Unwrap(pStateObjectToGrowFrom), riid,
                                         ppNewStateObject);
 
   if(riid != __uuidof(ID3D12StateObject))
@@ -160,8 +162,8 @@ HRESULT STDMETHODCALLTYPE WrappedID3D12Device::AddToStateObject(
 
   ID3D12StateObject *real = NULL;
   HRESULT ret;
-  SERIALISE_TIME_CALL(ret = m_pDevice7->AddToStateObject(&unwrappedDesc, pStateObjectToGrowFrom,
-                                                         riid, (void **)&real));
+  SERIALISE_TIME_CALL(ret = m_pDevice7->AddToStateObject(
+                          &unwrappedDesc, Unwrap(pStateObjectToGrowFrom), riid, (void **)&real));
 
   if(SUCCEEDED(ret))
   {
@@ -215,6 +217,8 @@ HRESULT STDMETHODCALLTYPE WrappedID3D12Device::AddToStateObject(
         }
       }
 
+      record->AddParent(GetRecord(pStateObjectToGrowFrom));
+
       if(vendorChunk)
         record->AddChunk(vendorChunk);
       record->AddChunk(scope.Get());