GraphicsCoder
diff --git a/‎renderdoc/driver/d3d12/d3d12_replay.cpp‎
Lines changed: 8 additions & 0 deletions b/‎renderdoc/driver/d3d12/d3d12_replay.cpp‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎renderdocui/Code/CommonPipelineState.cs‎
Lines changed: 9 additions & 0 deletions b/‎renderdocui/Code/CommonPipelineState.cs‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎renderdocui/Interop/Enums.cs‎
Lines changed: 2 additions & 0 deletions b/‎renderdocui/Interop/Enums.cs‎
Lines changed: 2 additions & 0 deletions
@@ -955,6 +955,10 @@ void D3D12Replay::MakePipelineState()
         if(rs.rtSingle)
           desc += i;
 
+        view.RootElement = (uint32_t)i;
+        view.Immediate = false;
+        view.VisibilityMask = eStageBits_All;
+
         FillResourceView(view, desc);
       }
     }
@@ -968,6 +972,10 @@ void D3D12Replay::MakePipelineState()
         D3D12Descriptor *desc =
             (D3D12Descriptor *)heap->GetCPUDescriptorHandleForHeapStart().ptr + rs.dsv.index;
 
+        view.RootElement = 0;
+        view.Immediate = false;
+        view.VisibilityMask = eStageBits_All;
+
         FillResourceView(view, desc);
       }
     }
 
@@ -970,6 +970,15 @@ public void GetConstantBuffer(ShaderStageType stage, uint BufIdx, uint ArrayIdx,
                     {
                         var bind = s.BindpointMapping.ConstantBlocks[s.ShaderDetails.ConstantBlocks[BufIdx].bindPoint];
 
+                        if (bind.bindset >= m_D3D12.m_RootSig.Spaces.Length ||
+                           bind.bind >= m_D3D12.m_RootSig.Spaces[bind.bindset].ConstantBuffers.Length)
+                        {
+                            buf = ResourceId.Null;
+                            ByteOffset = 0;
+                            ByteSize = 0;
+                            return;
+                        }
+
                         var descriptor = m_D3D12.m_RootSig.Spaces[bind.bindset].ConstantBuffers[bind.bind];
 
                         buf = descriptor.Buffer;
 
@@ -334,6 +334,7 @@ public enum ShaderStageType
     [Flags]
     public enum ShaderStageBits
     {
+        None         = 0,
         Vertex       = (1 << ShaderStageType.Vertex),
         Hull         = (1 << ShaderStageType.Hull),
         Tess_Control = (1 << ShaderStageType.Tess_Control),
@@ -343,6 +344,7 @@ public enum ShaderStageBits
         Pixel        = (1 << ShaderStageType.Pixel),
         Fragment     = (1 << ShaderStageType.Fragment),
         Compute      = (1 << ShaderStageType.Compute),
+        All          = (Vertex | Hull | Domain | Geometry | Pixel | Fragment | Compute),
     };
 
     public enum DebugMessageSource
Original file line number	Diff line number	Diff line change
`@@ -955,6 +955,10 @@ void D3D12Replay::MakePipelineState()`
`955`	`955`	`if(rs.rtSingle)`
`956`	`956`	`desc += i;`
`957`	`957`
	`958`	`+ view.RootElement = (uint32_t)i;`
	`959`	`+ view.Immediate = false;`
	`960`	`+ view.VisibilityMask = eStageBits_All;`
	`961`	`+`
`958`	`962`	`FillResourceView(view, desc);`
`959`	`963`	`}`
`960`	`964`	`}`
`@@ -968,6 +972,10 @@ void D3D12Replay::MakePipelineState()`
`968`	`972`	`D3D12Descriptor *desc =`
`969`	`973`	`(D3D12Descriptor *)heap->GetCPUDescriptorHandleForHeapStart().ptr + rs.dsv.index;`
`970`	`974`
	`975`	`+ view.RootElement = 0;`
	`976`	`+ view.Immediate = false;`
	`977`	`+ view.VisibilityMask = eStageBits_All;`
	`978`	`+`
`971`	`979`	`FillResourceView(view, desc);`
`972`	`980`	`}`
`973`	`981`	`}`