lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display table index for root sig elements

Browse Source
This commit is contained in:
baldurk
2016-10-14 09:58:15 +02:00
parent 2f93a4a64b
commit c37ee2bb03
5 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/api/replay/d3d12_pipestate.h
+6 -1
View File
@@ -83,6 +83,7 @@ struct D3D12PipelineState
ResourceView()
: Immediate(0),
RootElement(~0U),
TableIndex(~0U),
Resource(),
Format(),
BufferFlags(0),
@@ -106,6 +107,7 @@ struct D3D12PipelineState
// parameters from descriptor
bool32 Immediate;
uint32_t RootElement;
uint32_t TableIndex;
// parameters from resource/view
ResourceId Resource;
@@ -138,6 +140,7 @@ struct D3D12PipelineState
Sampler()
: Immediate(0),
RootElement(~0U),
TableIndex(~0U),
UseBorder(false),
UseComparison(false),
MaxAniso(0),
@@ -151,6 +154,7 @@ struct D3D12PipelineState
// parameters from descriptor
bool32 Immediate;
uint32_t RootElement;
uint32_t TableIndex;
// parameters from resource/view
rdctype::str AddressU, AddressV, AddressW;
@@ -167,10 +171,11 @@ struct D3D12PipelineState
struct CBuffer
{
CBuffer() : Immediate(0), RootElement(~0U), Buffer(), Offset(0), ByteSize(0) {}
CBuffer() : Immediate(0), RootElement(~0U), TableIndex(~0U), Buffer(), Offset(0), ByteSize(0) {}
// parameters from descriptor
bool32 Immediate;
uint32_t RootElement;
uint32_t TableIndex;
// parameters from resource/view
ResourceId Buffer;
renderdoc/driver/d3d12/d3d12_replay.cpp
+4
View File
@@ -654,6 +654,7 @@ void D3D12Replay::FillRegisterSpaces(
D3D12PipelineState::Sampler &samp = spaces[regSpace].samplers[shaderReg];
samp.Immediate = false;
samp.RootElement = (uint32_t)rootEl;
samp.TableIndex = offset + i;
if(desc)
{
@@ -697,6 +698,7 @@ void D3D12Replay::FillRegisterSpaces(
D3D12PipelineState::CBuffer &cb = spaces[regSpace].cbuffers[shaderReg];
cb.Immediate = false;
cb.RootElement = (uint32_t)rootEl;
cb.TableIndex = offset + i;
if(desc)
{
@@ -720,6 +722,7 @@ void D3D12Replay::FillRegisterSpaces(
D3D12PipelineState::ResourceView &view = spaces[regSpace].srvs[shaderReg];
view.Immediate = false;
view.RootElement = (uint32_t)rootEl;
view.TableIndex = offset + i;
if(desc)
{
@@ -740,6 +743,7 @@ void D3D12Replay::FillRegisterSpaces(
D3D12PipelineState::ResourceView &view = spaces[regSpace].uavs[shaderReg];
view.Immediate = false;
view.RootElement = (uint32_t)rootEl;
view.TableIndex = offset + i;
if(desc)
{
renderdocui/Interop/D3D12PipelineState.cs
+3
View File
@@ -89,6 +89,7 @@ namespace renderdoc
{
public bool Immediate;
public UInt32 RootElement;
public UInt32 TableIndex;
public ResourceId Resource;
[CustomMarshalAs(CustomUnmanagedType.UTF8TemplatedString)]
@@ -124,6 +125,7 @@ namespace renderdoc
{
public bool Immediate;
public UInt32 RootElement;
public UInt32 TableIndex;
[CustomMarshalAs(CustomUnmanagedType.UTF8TemplatedString)]
public string AddressU, AddressV, AddressW;
@@ -146,6 +148,7 @@ namespace renderdoc
{
public bool Immediate;
public UInt32 RootElement;
public UInt32 TableIndex;
public ResourceId Buffer;
public UInt64 Offset;
renderdocui/Windows/PipelineState/D3D12PipelineStateViewer.Designer.cs
Generated
+24 -24
View File
@@ -1147,7 +1147,7 @@
// vsUAVs
//
treeListColumn16.AutoSizeMinSize = 0;
treeListColumn16.Width = 70;
treeListColumn16.Width = 100;
treeListColumn17.AutoSizeMinSize = 0;
treeListColumn17.Width = 40;
treeListColumn18.AutoSizeMinSize = 0;
@@ -1350,7 +1350,7 @@
// vsResources
//
treeListColumn27.AutoSizeMinSize = 0;
treeListColumn27.Width = 70;
treeListColumn27.Width = 100;
treeListColumn28.AutoSizeMinSize = 0;
treeListColumn28.Width = 40;
treeListColumn29.AutoSizeMinSize = 0;
@@ -1422,7 +1422,7 @@
// vsSamplers
//
treeListColumn38.AutoSizeMinSize = 0;
treeListColumn38.Width = 70;
treeListColumn38.Width = 100;
treeListColumn39.AutoSizeMinSize = 0;
treeListColumn39.Width = 40;
treeListColumn40.AutoSizeMinSize = 0;
@@ -1478,7 +1478,7 @@
// vsCBuffers
//
treeListColumn45.AutoSizeMinSize = 0;
treeListColumn45.Width = 70;
treeListColumn45.Width = 100;
treeListColumn46.AutoSizeMinSize = 0;
treeListColumn46.Width = 40;
treeListColumn47.AutoSizeMinSize = 0;
@@ -1579,7 +1579,7 @@
// hsUAVs
//
treeListColumn52.AutoSizeMinSize = 0;
treeListColumn52.Width = 70;
treeListColumn52.Width = 100;
treeListColumn53.AutoSizeMinSize = 0;
treeListColumn53.Width = 40;
treeListColumn54.AutoSizeMinSize = 0;
@@ -1782,7 +1782,7 @@
// hsResources
//
treeListColumn63.AutoSizeMinSize = 0;
treeListColumn63.Width = 70;
treeListColumn63.Width = 100;
treeListColumn64.AutoSizeMinSize = 0;
treeListColumn64.Width = 40;
treeListColumn65.AutoSizeMinSize = 0;
@@ -1854,7 +1854,7 @@
// hsSamplers
//
treeListColumn74.AutoSizeMinSize = 0;
treeListColumn74.Width = 70;
treeListColumn74.Width = 100;
treeListColumn75.AutoSizeMinSize = 0;
treeListColumn75.Width = 40;
treeListColumn76.AutoSizeMinSize = 0;
@@ -1910,7 +1910,7 @@
// hsCBuffers
//
treeListColumn81.AutoSizeMinSize = 0;
treeListColumn81.Width = 70;
treeListColumn81.Width = 100;
treeListColumn82.AutoSizeMinSize = 0;
treeListColumn82.Width = 40;
treeListColumn83.AutoSizeMinSize = 0;
@@ -2011,7 +2011,7 @@
// dsUAVs
//
treeListColumn88.AutoSizeMinSize = 0;
treeListColumn88.Width = 70;
treeListColumn88.Width = 100;
treeListColumn89.AutoSizeMinSize = 0;
treeListColumn89.Width = 40;
treeListColumn90.AutoSizeMinSize = 0;
@@ -2214,7 +2214,7 @@
// dsResources
//
treeListColumn99.AutoSizeMinSize = 0;
treeListColumn99.Width = 70;
treeListColumn99.Width = 100;
treeListColumn100.AutoSizeMinSize = 0;
treeListColumn100.Width = 40;
treeListColumn101.AutoSizeMinSize = 0;
@@ -2286,7 +2286,7 @@
// dsSamplers
//
treeListColumn110.AutoSizeMinSize = 0;
treeListColumn110.Width = 70;
treeListColumn110.Width = 100;
treeListColumn111.AutoSizeMinSize = 0;
treeListColumn111.Width = 40;
treeListColumn112.AutoSizeMinSize = 0;
@@ -2342,7 +2342,7 @@
// dsCBuffers
//
treeListColumn117.AutoSizeMinSize = 0;
treeListColumn117.Width = 70;
treeListColumn117.Width = 100;
treeListColumn118.AutoSizeMinSize = 0;
treeListColumn118.Width = 40;
treeListColumn119.AutoSizeMinSize = 0;
@@ -2447,7 +2447,7 @@
// gsUAVs
//
treeListColumn124.AutoSizeMinSize = 0;
treeListColumn124.Width = 70;
treeListColumn124.Width = 100;
treeListColumn125.AutoSizeMinSize = 0;
treeListColumn125.Width = 40;
treeListColumn126.AutoSizeMinSize = 0;
@@ -2706,7 +2706,7 @@
// gsResources
//
treeListColumn140.AutoSizeMinSize = 0;
treeListColumn140.Width = 70;
treeListColumn140.Width = 100;
treeListColumn141.AutoSizeMinSize = 0;
treeListColumn141.Width = 40;
treeListColumn142.AutoSizeMinSize = 0;
@@ -2779,7 +2779,7 @@
// gsSamplers
//
treeListColumn151.AutoSizeMinSize = 0;
treeListColumn151.Width = 70;
treeListColumn151.Width = 100;
treeListColumn152.AutoSizeMinSize = 0;
treeListColumn152.Width = 40;
treeListColumn153.AutoSizeMinSize = 0;
@@ -2835,7 +2835,7 @@
// gsCBuffers
//
treeListColumn158.AutoSizeMinSize = 0;
treeListColumn158.Width = 70;
treeListColumn158.Width = 100;
treeListColumn159.AutoSizeMinSize = 0;
treeListColumn159.Width = 40;
treeListColumn160.AutoSizeMinSize = 0;
@@ -3401,7 +3401,7 @@
// psUAVs
//
treeListColumn177.AutoSizeMinSize = 0;
treeListColumn177.Width = 70;
treeListColumn177.Width = 100;
treeListColumn178.AutoSizeMinSize = 0;
treeListColumn178.Width = 40;
treeListColumn179.AutoSizeMinSize = 0;
@@ -3604,7 +3604,7 @@
// psResources
//
treeListColumn188.AutoSizeMinSize = 0;
treeListColumn188.Width = 70;
treeListColumn188.Width = 100;
treeListColumn189.AutoSizeMinSize = 0;
treeListColumn189.Width = 40;
treeListColumn190.AutoSizeMinSize = 0;
@@ -3676,7 +3676,7 @@
// psSamplers
//
treeListColumn199.AutoSizeMinSize = 0;
treeListColumn199.Width = 70;
treeListColumn199.Width = 100;
treeListColumn200.AutoSizeMinSize = 0;
treeListColumn200.Width = 40;
treeListColumn201.AutoSizeMinSize = 0;
@@ -3732,7 +3732,7 @@
// psCBuffers
//
treeListColumn206.AutoSizeMinSize = 0;
treeListColumn206.Width = 70;
treeListColumn206.Width = 100;
treeListColumn207.AutoSizeMinSize = 0;
treeListColumn207.Width = 40;
treeListColumn208.AutoSizeMinSize = 0;
@@ -4405,7 +4405,7 @@
// csUAVs
//
treeListColumn238.AutoSizeMinSize = 0;
treeListColumn238.Width = 70;
treeListColumn238.Width = 100;
treeListColumn239.AutoSizeMinSize = 0;
treeListColumn239.Width = 40;
treeListColumn240.AutoSizeMinSize = 0;
@@ -4728,7 +4728,7 @@
// csResources
//
treeListColumn249.AutoSizeMinSize = 0;
treeListColumn249.Width = 70;
treeListColumn249.Width = 100;
treeListColumn250.AutoSizeMinSize = 0;
treeListColumn250.Width = 40;
treeListColumn251.AutoSizeMinSize = 0;
@@ -4800,7 +4800,7 @@
// csSamplers
//
treeListColumn260.AutoSizeMinSize = 0;
treeListColumn260.Width = 70;
treeListColumn260.Width = 100;
treeListColumn261.AutoSizeMinSize = 0;
treeListColumn261.Width = 40;
treeListColumn262.AutoSizeMinSize = 0;
@@ -4856,7 +4856,7 @@
// csCBuffers
//
treeListColumn267.AutoSizeMinSize = 0;
treeListColumn267.Width = 70;
treeListColumn267.Width = 100;
treeListColumn268.AutoSizeMinSize = 0;
treeListColumn268.Width = 40;
treeListColumn269.AutoSizeMinSize = 0;
renderdocui/Windows/PipelineState/D3D12PipelineStateViewer.cs
+3 -3
View File
@@ -351,7 +351,7 @@ namespace renderdocui.Windows.PipelineState
}
}
string rootel = r.Immediate ? String.Format("#{0} Direct", r.RootElement) : rootel = String.Format("#{0} Table", r.RootElement);
string rootel = r.Immediate ? String.Format("#{0} Direct", r.RootElement) : rootel = String.Format("#{0} Table[{1}]", r.RootElement, r.TableIndex);
bool filledSlot = r.Resource != ResourceId.Null;
bool usedSlot = (bind != null && bind.used);
@@ -582,7 +582,7 @@ namespace renderdocui.Windows.PipelineState
}
}
string rootel = s.Immediate ? String.Format("#{0} Static", s.RootElement) : String.Format("#{0} Table", s.RootElement);
string rootel = s.Immediate ? String.Format("#{0} Static", s.RootElement) : String.Format("#{0} Table[{1}]", s.RootElement, s.TableIndex);
bool filledSlot = (s.AddressU.Length > 0);
bool usedSlot = (bind != null && bind.used);
@@ -726,7 +726,7 @@ namespace renderdocui.Windows.PipelineState
}
else
{
rootel = String.Format("#{0} Table", b.RootElement);
rootel = String.Format("#{0} Table[{1}]", b.RootElement, b.TableIndex);
}
bool filledSlot = (b.Buffer != ResourceId.Null);