From 6655f9d789096d66028878aade69381bc8eb3baa Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 21 Oct 2016 21:37:34 +0200
Subject: [PATCH] Instead of overwriting each constant set, accumulate constant
 values

---
 .../driver/d3d12/d3d12_command_list_wrap.cpp  | 20 +++++++++----------
 renderdoc/driver/d3d12/d3d12_state.h          | 17 +++-------------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
index d4fe61d58..21b31f48e 100644
--- a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
+++ b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
@@ -1406,7 +1406,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_SetComputeRoot32BitConstant(
       if(m_Cmd->m_RenderState.compute.sigelems.size() < idx + 1)
         m_Cmd->m_RenderState.compute.sigelems.resize(idx + 1);
 
-      m_Cmd->m_RenderState.compute.sigelems[idx] = D3D12RenderState::SignatureElement(offs, val);
+      m_Cmd->m_RenderState.compute.sigelems[idx].SetConstant(offs, val);
     }
   }
   else if(m_State == READING)
@@ -1419,7 +1419,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_SetComputeRoot32BitConstant(
     if(state.compute.sigelems.size() < idx + 1)
       state.compute.sigelems.resize(idx + 1);
 
-    state.compute.sigelems[idx] = D3D12RenderState::SignatureElement(offs, val);
+    state.compute.sigelems[idx].SetConstant(offs, val);
   }
 
   return true;
@@ -1462,8 +1462,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_SetComputeRoot32BitConstants(
       if(m_Cmd->m_RenderState.compute.sigelems.size() < idx + 1)
         m_Cmd->m_RenderState.compute.sigelems.resize(idx + 1);
 
-      m_Cmd->m_RenderState.compute.sigelems[idx] =
-          D3D12RenderState::SignatureElement(num, data, offs);
+      m_Cmd->m_RenderState.compute.sigelems[idx].SetConstants(num, data, offs);
     }
   }
   else if(m_State == READING)
@@ -1476,7 +1475,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_SetComputeRoot32BitConstants(
     if(state.compute.sigelems.size() < idx + 1)
       state.compute.sigelems.resize(idx + 1);
 
-    state.compute.sigelems[idx] = D3D12RenderState::SignatureElement(num, data, offs);
+    state.compute.sigelems[idx].SetConstants(num, data, offs);
   }
 
   SAFE_DELETE_ARRAY(data);
@@ -1905,7 +1904,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_SetGraphicsRoot32BitConstant(
       if(m_Cmd->m_RenderState.graphics.sigelems.size() < idx + 1)
         m_Cmd->m_RenderState.graphics.sigelems.resize(idx + 1);
 
-      m_Cmd->m_RenderState.graphics.sigelems[idx] = D3D12RenderState::SignatureElement(offs, val);
+      m_Cmd->m_RenderState.graphics.sigelems[idx].SetConstant(offs, val);
     }
   }
   else if(m_State == READING)
@@ -1918,7 +1917,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_SetGraphicsRoot32BitConstant(
     if(state.graphics.sigelems.size() < idx + 1)
       state.graphics.sigelems.resize(idx + 1);
 
-    state.graphics.sigelems[idx] = D3D12RenderState::SignatureElement(offs, val);
+    state.graphics.sigelems[idx].SetConstant(offs, val);
   }
 
   return true;
@@ -1961,8 +1960,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_SetGraphicsRoot32BitConstants(
       if(m_Cmd->m_RenderState.graphics.sigelems.size() < idx + 1)
         m_Cmd->m_RenderState.graphics.sigelems.resize(idx + 1);
 
-      m_Cmd->m_RenderState.graphics.sigelems[idx] =
-          D3D12RenderState::SignatureElement(num, data, offs);
+      m_Cmd->m_RenderState.graphics.sigelems[idx].SetConstants(num, data, offs);
     }
   }
   else if(m_State == READING)
@@ -1975,7 +1973,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_SetGraphicsRoot32BitConstants(
     if(state.graphics.sigelems.size() < idx + 1)
       state.graphics.sigelems.resize(idx + 1);
 
-    state.graphics.sigelems[idx] = D3D12RenderState::SignatureElement(num, data, offs);
+    state.graphics.sigelems[idx].SetConstants(num, data, offs);
   }
 
   SAFE_DELETE_ARRAY(data);
@@ -3484,7 +3482,7 @@ void WrappedID3D12GraphicsCommandList::ReplayExecuteIndirect(ID3D12GraphicsComma
             if(sigelems.size() < arg.Constant.RootParameterIndex + 1)
               sigelems.resize(arg.Constant.RootParameterIndex + 1);
 
-            sigelems[arg.Constant.RootParameterIndex] = D3D12RenderState::SignatureElement(
+            sigelems[arg.Constant.RootParameterIndex].SetConstants(
                 arg.Constant.Num32BitValuesToSet, values, arg.Constant.DestOffsetIn32BitValues);
 
             if(gfx)
diff --git a/renderdoc/driver/d3d12/d3d12_state.h b/renderdoc/driver/d3d12/d3d12_state.h
index 7d99c546c..811b8e104 100644
--- a/renderdoc/driver/d3d12/d3d12_state.h
+++ b/renderdoc/driver/d3d12/d3d12_state.h
@@ -61,19 +61,11 @@ struct D3D12RenderState
   {
     SignatureElement() : type(eRootUnknown), offset(0) {}
     SignatureElement(SignatureElementType t, ResourceId i, UINT64 o) : type(t), id(i), offset(o) {}
-    SignatureElement(UINT offs, UINT val) : type(eRootConst), offset(offs)
+    void SetConstant(UINT offs, UINT val) { SetConstants(1, &val, offs); }
+    void SetConstants(UINT numVals, const void *vals, UINT offs)
     {
       type = eRootConst;
-      SetValues(1, &val, offs);
-    }
-    SignatureElement(UINT numVals, const void *vals, UINT offs)
-    {
-      type = eRootConst;
-      SetValues(numVals, vals, offs);
-    }
 
-    void SetValues(UINT numVals, const void *vals, UINT offs)
-    {
       if(constants.size() < offs + numVals)
         constants.resize(offs + numVals);
 
@@ -84,10 +76,7 @@ struct D3D12RenderState
     {
       if(type == eRootConst)
       {
-        if(constants.size() == 1)
-          cmd->SetGraphicsRoot32BitConstant(slot, constants[0], (UINT)offset);
-        else
-          cmd->SetGraphicsRoot32BitConstants(slot, (UINT)constants.size(), &constants[0], 0);
+        cmd->SetGraphicsRoot32BitConstants(slot, (UINT)constants.size(), &constants[0], 0);
       }
       else if(type == eRootTable)
       {