Look up constant buffers properly via shader details in D3D11. Refs baldurk#411

baldurk · baldurk · commit dc96853b39c9 · 2016-11-02T23:39:35.000+01:00
diff --git a/renderdocui/Code/CommonPipelineState.cs b/renderdocui/Code/CommonPipelineState.cs
@@ -943,13 +943,18 @@ public void GetConstantBuffer(ShaderStageType stage, uint BufIdx, uint ArrayIdx,
                         case ShaderStageType.Compute: s = m_D3D11.m_CS; break;
                     }
 
-                    if(BufIdx < s.ConstantBuffers.Length)
+                    if (s.ShaderDetails != null && BufIdx < s.ShaderDetails.ConstantBlocks.Length)
                     {
-                        buf = s.ConstantBuffers[BufIdx].Buffer;
-                        ByteOffset = (ulong)(s.ConstantBuffers[BufIdx].VecOffset * 4 * sizeof(float));
-                        ByteSize = (ulong)(s.ConstantBuffers[BufIdx].VecCount * 4 * sizeof(float));
+                        int bind = s.ShaderDetails.ConstantBlocks[BufIdx].bindPoint;
 
-                        return;
+                        if (bind < s.ConstantBuffers.Length)
+                        {
+                            buf = s.ConstantBuffers[bind].Buffer;
+                            ByteOffset = (ulong)(s.ConstantBuffers[bind].VecOffset * 4 * sizeof(float));
+                            ByteSize = (ulong)(s.ConstantBuffers[bind].VecCount * 4 * sizeof(float));
+
+                            return;
+                        }
                     }
                 }
                 else if (IsLogD3D12)

Original file line number	Diff line number	Diff line change
`@@ -943,13 +943,18 @@ public void GetConstantBuffer(ShaderStageType stage, uint BufIdx, uint ArrayIdx,`
`943`	`943`	`case ShaderStageType.Compute: s = m_D3D11.m_CS; break;`
`944`	`944`	`}`
`945`	`945`
`946`		`- if(BufIdx < s.ConstantBuffers.Length)`
	`946`	`+ if (s.ShaderDetails != null && BufIdx < s.ShaderDetails.ConstantBlocks.Length)`
`947`	`947`	`{`
`948`		`- buf = s.ConstantBuffers[BufIdx].Buffer;`
`949`		`- ByteOffset = (ulong)(s.ConstantBuffers[BufIdx].VecOffset * 4 * sizeof(float));`
`950`		`- ByteSize = (ulong)(s.ConstantBuffers[BufIdx].VecCount * 4 * sizeof(float));`
	`948`	`+ int bind = s.ShaderDetails.ConstantBlocks[BufIdx].bindPoint;`
`951`	`949`
`952`		`- return;`
	`950`	`+ if (bind < s.ConstantBuffers.Length)`
	`951`	`+ {`
	`952`	`+ buf = s.ConstantBuffers[bind].Buffer;`
	`953`	`+ ByteOffset = (ulong)(s.ConstantBuffers[bind].VecOffset * 4 * sizeof(float));`
	`954`	`+ ByteSize = (ulong)(s.ConstantBuffers[bind].VecCount * 4 * sizeof(float));`
	`955`	`+`
	`956`	`+ return;`
	`957`	`+ }`
`953`	`958`	`}`
`954`	`959`	`}`
`955`	`960`	`else if (IsLogD3D12)`