Check if views have the raw flag first before checking struct size

This commit is contained in:
baldurk
2016-08-30 16:58:39 +02:00
parent fb418f883e
commit 6a7ccb9670
@@ -418,15 +418,15 @@ namespace renderdocui.Windows.PipelineState
name = bufs[t].name;
typename = "Buffer";
// for structured buffers, display how many 'elements' there are in the buffer
if (r.ElementSize > 0)
{
typename = "StructuredBuffer[" + (bufs[t].length / r.ElementSize) + "]";
}
else if (r.Flags.HasFlag(D3D11BufferViewFlags.Raw))
if (r.Flags.HasFlag(D3D11BufferViewFlags.Raw))
{
typename = "ByteAddressBuffer";
}
else if (r.ElementSize > 0)
{
// for structured buffers, display how many 'elements' there are in the buffer
typename = "StructuredBuffer[" + (bufs[t].length / r.ElementSize) + "]";
}
if (r.Flags.HasFlag(D3D11BufferViewFlags.Append) || r.Flags.HasFlag(D3D11BufferViewFlags.Counter))
{
@@ -1144,14 +1144,15 @@ namespace renderdocui.Windows.PipelineState
name = bufs[t].name;
typename = "Buffer";
if (r.ElementSize > 0)
{
typename = "RWStructuredBuffer[" + (bufs[t].length / r.ElementSize) + "]";
}
else if (r.Flags.HasFlag(D3D11BufferViewFlags.Raw))
if (r.Flags.HasFlag(D3D11BufferViewFlags.Raw))
{
typename = "RWByteAddressBuffer";
}
else if (r.ElementSize > 0)
{
// for structured buffers, display how many 'elements' there are in the buffer
typename = "RWStructuredBuffer[" + (bufs[t].length / r.ElementSize) + "]";
}
if (r.Flags.HasFlag(D3D11BufferViewFlags.Append) || r.Flags.HasFlag(D3D11BufferViewFlags.Counter))
{
@@ -1517,14 +1518,15 @@ namespace renderdocui.Windows.PipelineState
name = bufs[t].name;
typename = "Buffer";
if (r.ElementSize > 0)
{
typename = "RWStructuredBuffer[" + (bufs[t].length / r.ElementSize) + "]";
}
else if (r.Flags.HasFlag(D3D11BufferViewFlags.Raw))
if (r.Flags.HasFlag(D3D11BufferViewFlags.Raw))
{
typename = "RWByteAddressBuffer";
}
else if (r.ElementSize > 0)
{
// for structured buffers, display how many 'elements' there are in the buffer
typename = "RWStructuredBuffer[" + (bufs[t].length / r.ElementSize) + "]";
}
if (r.Flags.HasFlag(D3D11BufferViewFlags.Append) || r.Flags.HasFlag(D3D11BufferViewFlags.Counter))
{
@@ -3027,15 +3029,15 @@ namespace renderdocui.Windows.PipelineState
name = bufs[t].name;
typename = "Buffer";
// for structured buffers, display how many 'elements' there are in the buffer
if (view.ElementSize > 0)
{
typename = (rw ? "RWStructuredBuffer" : "StructuredBuffer") + "[" + (bufs[t].length / view.ElementSize) + "]";
}
else if (view.Flags.HasFlag(D3D11BufferViewFlags.Raw))
if (view.Flags.HasFlag(D3D11BufferViewFlags.Raw))
{
typename = rw ? "RWByteAddressBuffer" : "ByteAddressBuffer";
}
else if (view.ElementSize > 0)
{
// for structured buffers, display how many 'elements' there are in the buffer
typename = (rw ? "RWStructuredBuffer" : "StructuredBuffer") + "[" + (bufs[t].length / view.ElementSize) + "]";
}
if (view.Flags.HasFlag(D3D11BufferViewFlags.Append) || view.Flags.HasFlag(D3D11BufferViewFlags.Counter))
{