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

Standardise pipeline object names with name/customName where relevant

Browse Source
This commit is contained in:
baldurk
2017-04-04 18:34:14 +01:00
parent 42b599ff70
commit f1df7423e2
11 changed files with 66 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/CommonPipelineState.cpp
+18 -18
View File
@@ -366,12 +366,12 @@ QString CommonPipelineState::GetShaderName(ShaderStage stage)
{
switch(stage)
{
case ShaderStage::Vertex: ret = m_D3D11->m_VS.ShaderName; break;
case ShaderStage::Domain: ret = m_D3D11->m_DS.ShaderName; break;
case ShaderStage::Hull: ret = m_D3D11->m_HS.ShaderName; break;
case ShaderStage::Geometry: ret = m_D3D11->m_GS.ShaderName; break;
case ShaderStage::Pixel: ret = m_D3D11->m_PS.ShaderName; break;
case ShaderStage::Compute: ret = m_D3D11->m_CS.ShaderName; break;
case ShaderStage::Vertex: ret = m_D3D11->m_VS.name; break;
case ShaderStage::Domain: ret = m_D3D11->m_DS.name; break;
case ShaderStage::Hull: ret = m_D3D11->m_HS.name; break;
case ShaderStage::Geometry: ret = m_D3D11->m_GS.name; break;
case ShaderStage::Pixel: ret = m_D3D11->m_PS.name; break;
case ShaderStage::Compute: ret = m_D3D11->m_CS.name; break;
default: break;
}
}
@@ -379,12 +379,12 @@ QString CommonPipelineState::GetShaderName(ShaderStage stage)
{
switch(stage)
{
case ShaderStage::Vertex: ret = QString(m_D3D12->PipelineName) + " VS"; break;
case ShaderStage::Domain: ret = QString(m_D3D12->PipelineName) + " DS"; break;
case ShaderStage::Hull: ret = QString(m_D3D12->PipelineName) + " HS"; break;
case ShaderStage::Geometry: ret = QString(m_D3D12->PipelineName) + " GS"; break;
case ShaderStage::Pixel: ret = QString(m_D3D12->PipelineName) + " PS"; break;
case ShaderStage::Compute: ret = QString(m_D3D12->PipelineName) + " CS"; break;
case ShaderStage::Vertex: ret = QString(m_D3D12->name) + " VS"; break;
case ShaderStage::Domain: ret = QString(m_D3D12->name) + " DS"; break;
case ShaderStage::Hull: ret = QString(m_D3D12->name) + " HS"; break;
case ShaderStage::Geometry: ret = QString(m_D3D12->name) + " GS"; break;
case ShaderStage::Pixel: ret = QString(m_D3D12->name) + " PS"; break;
case ShaderStage::Compute: ret = QString(m_D3D12->name) + " CS"; break;
default: break;
}
}
@@ -405,12 +405,12 @@ QString CommonPipelineState::GetShaderName(ShaderStage stage)
{
switch(stage)
{
case ShaderStage::Vertex: ret = m_Vulkan->m_VS.ShaderName; break;
case ShaderStage::Domain: ret = m_Vulkan->m_TCS.ShaderName; break;
case ShaderStage::Hull: ret = m_Vulkan->m_TES.ShaderName; break;
case ShaderStage::Geometry: ret = m_Vulkan->m_GS.ShaderName; break;
case ShaderStage::Pixel: ret = m_Vulkan->m_FS.ShaderName; break;
case ShaderStage::Compute: ret = m_Vulkan->m_CS.ShaderName; break;
case ShaderStage::Vertex: ret = m_Vulkan->m_VS.name; break;
case ShaderStage::Domain: ret = m_Vulkan->m_TCS.name; break;
case ShaderStage::Hull: ret = m_Vulkan->m_TES.name; break;
case ShaderStage::Geometry: ret = m_Vulkan->m_GS.name; break;
case ShaderStage::Pixel: ret = m_Vulkan->m_FS.name; break;
case ShaderStage::Compute: ret = m_Vulkan->m_CS.name; break;
default: break;
}
}
qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
+4 -4
View File
@@ -789,7 +789,7 @@ void D3D11PipelineStateViewer::setShaderState(const D3D11Pipe::Shader &stage, QL
if(stage.Object == ResourceId())
shader->setText(tr("Unbound Shader"));
else
shader->setText(ToQStr(stage.ShaderName));
shader->setText(ToQStr(stage.name));
if(shaderDetails && !shaderDetails->DebugInfo.entryFunc.empty() &&
!shaderDetails->DebugInfo.files.empty())
@@ -863,8 +863,8 @@ void D3D11PipelineStateViewer::setShaderState(const D3D11Pipe::Shader &stage, QL
if(shaderInput && !shaderInput->name.empty())
slotname += ": " + ToQStr(shaderInput->name);
if(s.customSamplerName)
slotname += "(" + ToQStr(s.SamplerName) + ")";
if(s.customName)
slotname += "(" + ToQStr(s.name) + ")";
QString borderColor =
QString::number(s.BorderColor[0]) + ", " + QString::number(s.BorderColor[1]) + ", " +
@@ -1049,7 +1049,7 @@ void D3D11PipelineStateViewer::setState()
if(state.m_IA.Bytecode)
{
QString layout = ToQStr(state.m_IA.LayoutName);
QString layout = ToQStr(state.m_IA.name);
if(state.m_IA.Bytecode && !state.m_IA.Bytecode->DebugInfo.entryFunc.empty())
layout += " (" + ToQStr(state.m_IA.Bytecode->DebugInfo.entryFunc) + ")";
qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
+2 -2
View File
@@ -884,9 +884,9 @@ void D3D12PipelineStateViewer::setShaderState(const D3D12Pipe::Shader &stage, QL
if(stage.Object == ResourceId())
shader->setText(tr("Unbound Shader"));
else if(state.customName)
shader->setText(ToQStr(state.PipelineName) + " - " + m_Ctx.CurPipelineState.Abbrev(stage.stage));
shader->setText(ToQStr(state.name) + " - " + m_Ctx.CurPipelineState.Abbrev(stage.stage));
else
shader->setText(ToQStr(state.PipelineName) + " - " + ToQStr(stage.stage, GraphicsAPI::D3D12) +
shader->setText(ToQStr(state.name) + " - " + ToQStr(stage.stage, GraphicsAPI::D3D12) +
" Shader");
if(shaderDetails && !shaderDetails->DebugInfo.entryFunc.empty() &&
qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
+2 -2
View File
@@ -657,7 +657,7 @@ QVariantList VulkanPipelineStateViewer::makeSampler(const QString &bindset, cons
bindset,
slotname,
descriptor.immutableSampler ? "Immutable Sampler" : "Sampler",
ToQStr(descriptor.SamplerName),
ToQStr(descriptor.name),
addressing,
filter + ", " + lod};
}
@@ -1228,7 +1228,7 @@ void VulkanPipelineStateViewer::setShaderState(const VKPipe::Shader &stage,
if(stage.Object == ResourceId())
shader->setText(tr("Unbound Shader"));
else
shader->setText(ToQStr(stage.ShaderName));
shader->setText(ToQStr(stage.name));
if(shaderDetails != NULL && shaderDetails->DebugInfo.entryFunc.count > 0)
{
renderdoc/api/replay/d3d11_pipestate.h
+8 -6
View File
@@ -66,8 +66,8 @@ struct IA
ResourceId layout;
ShaderReflection *Bytecode;
bool32 customName;
rdctype::str LayoutName;
rdctype::str name;
rdctype::array<VB> vbuffers;
IB ibuffer;
@@ -121,7 +121,7 @@ struct Sampler
{
Sampler()
: Samp(),
customSamplerName(false),
customName(false),
UseBorder(false),
UseComparison(false),
MaxAniso(0),
@@ -132,9 +132,11 @@ struct Sampler
BorderColor[0] = BorderColor[1] = BorderColor[2] = BorderColor[3] = 0.0f;
}
ResourceId Samp;
rdctype::str SamplerName;
bool32 customSamplerName;
rdctype::str AddressU, AddressV, AddressW;
rdctype::str name;
bool32 customName;
rdctype::str AddressU;
rdctype::str AddressV;
rdctype::str AddressW;
float BorderColor[4];
rdctype::str Comparison;
rdctype::str Filter;
@@ -158,7 +160,7 @@ struct Shader
{
Shader() : Object(), customName(false), ShaderDetails(NULL), stage(ShaderStage::Vertex) {}
ResourceId Object;
rdctype::str ShaderName;
rdctype::str name;
bool32 customName;
ShaderReflection *ShaderDetails;
ShaderBindpointMapping BindpointMapping;
renderdoc/api/replay/d3d12_pipestate.h
+1 -1
View File
@@ -381,7 +381,7 @@ struct State
State() : customName(false) {}
ResourceId pipeline;
bool32 customName;
rdctype::str PipelineName;
rdctype::str name;
ResourceId rootSig;
renderdoc/api/replay/vk_pipestate.h
+4 -4
View File
@@ -30,7 +30,7 @@ struct BindingElement
{
BindingElement()
: immutableSampler(false),
customSamplerName(false),
customName(false),
baseMip(0),
baseLayer(0),
offset(0),
@@ -54,8 +54,8 @@ struct BindingElement
ResourceId sampler;
bool32 immutableSampler;
rdctype::str SamplerName;
bool32 customSamplerName;
rdctype::str name;
bool32 customName;
// image views
ResourceFormat viewfmt;
@@ -168,7 +168,7 @@ struct Shader
ResourceId Object;
rdctype::str entryPoint;
rdctype::str ShaderName;
rdctype::str name;
bool32 customName;
ShaderReflection *ShaderDetails;
renderdoc/core/replay_proxy.cpp
+8 -8
View File
@@ -318,7 +318,7 @@ void Serialiser::Serialise(const char *name, D3D11Pipe::IA &el)
Serialise("", el.ibuffer.Offset);
Serialise("", el.customName);
Serialise("", el.LayoutName);
Serialise("", el.name);
Serialise("", el.vbuffers);
Serialise("", el.layouts);
@@ -352,8 +352,8 @@ template <>
void Serialiser::Serialise(const char *name, D3D11Pipe::Sampler &el)
{
Serialise("", el.Samp);
Serialise("", el.SamplerName);
Serialise("", el.customSamplerName);
Serialise("", el.name);
Serialise("", el.customName);
Serialise("", el.AddressU);
Serialise("", el.AddressV);
Serialise("", el.AddressW);
@@ -375,7 +375,7 @@ void Serialiser::Serialise(const char *name, D3D11Pipe::Shader &el)
{
Serialise("", el.Object);
Serialise("", el.stage);
Serialise("", el.ShaderName);
Serialise("", el.name);
Serialise("", el.customName);
if(m_Mode == READING)
@@ -704,7 +704,7 @@ void Serialiser::Serialise(const char *name, D3D12Pipe::State &el)
{
Serialise("", el.pipeline);
Serialise("", el.customName);
Serialise("", el.PipelineName);
Serialise("", el.name);
Serialise("", el.rootSig);
@@ -975,8 +975,8 @@ void Serialiser::Serialise(const char *name, VKPipe::BindingElement &el)
Serialise("", el.sampler);
Serialise("", el.immutableSampler);
Serialise("", el.SamplerName);
Serialise("", el.customSamplerName);
Serialise("", el.name);
Serialise("", el.customName);
Serialise("", el.viewfmt);
SerialisePODArray<4>("", el.swizzle);
@@ -1077,7 +1077,7 @@ void Serialiser::Serialise(const char *name, VKPipe::Shader &el)
Serialise("", el.Object);
Serialise("", el.entryPoint);
Serialise("", el.ShaderName);
Serialise("", el.name);
Serialise("", el.customName);
Serialise("", el.BindpointMapping);
Serialise("", el.stage);
renderdoc/driver/d3d11/d3d11_replay.cpp
+7 -7
View File
@@ -471,7 +471,7 @@ D3D11Pipe::State D3D11Replay::MakePipelineState()
str = StringFormat::Fmt("Input Layout %llu", ret.m_IA.layout);
}
ret.m_IA.LayoutName = str;
ret.m_IA.name = str;
create_array_uninit(ret.m_IA.layouts, vec.size());
@@ -543,7 +543,7 @@ D3D11Pipe::State D3D11Replay::MakePipelineState()
str = StringFormat::Fmt("%s Shader %llu", stageNames[stage], dst.Object);
}
dst.ShaderName = str;
dst.name = str;
// create identity bindpoint mapping
create_array_uninit(dst.BindpointMapping.InputAttributes,
@@ -617,13 +617,13 @@ D3D11Pipe::State D3D11Replay::MakePipelineState()
if(samp.Samp != ResourceId())
{
samp.SamplerName = GetDebugName(src.Samplers[s]);
samp.customSamplerName = true;
samp.name = GetDebugName(src.Samplers[s]);
samp.customName = true;
if(samp.SamplerName.count == 0)
if(samp.name.count == 0)
{
samp.customSamplerName = false;
samp.SamplerName = StringFormat::Fmt("Sampler %llu", samp.Samp);
samp.customName = false;
samp.name = StringFormat::Fmt("Sampler %llu", samp.Samp);
}
D3D11_SAMPLER_DESC desc;
renderdoc/driver/d3d12/d3d12_replay.cpp
+1 -1
View File
@@ -895,7 +895,7 @@ void D3D12Replay::MakePipelineState()
str = "Unbound";
}
state.PipelineName = str;
state.name = str;
if(pipe && pipe->IsGraphics())
{
renderdoc/driver/vulkan/vk_replay.cpp
+11 -11
View File
@@ -3188,11 +3188,11 @@ void VulkanReplay::SavePipelineState()
stage.ShaderDetails = NULL;
stage.customName = true;
stage.ShaderName = m_pDriver->m_CreationInfo.m_Names[p.shaders[i].module];
if(stage.ShaderName.count == 0)
stage.name = m_pDriver->m_CreationInfo.m_Names[p.shaders[i].module];
if(stage.name.count == 0)
{
stage.customName = false;
stage.ShaderName = StringFormat::Fmt("Shader %llu", stage.Object);
stage.name = StringFormat::Fmt("Shader %llu", stage.Object);
}
stage.stage = ShaderStage::Compute;
@@ -3258,11 +3258,11 @@ void VulkanReplay::SavePipelineState()
stages[i]->ShaderDetails = NULL;
stages[i]->customName = true;
stages[i]->ShaderName = m_pDriver->m_CreationInfo.m_Names[p.shaders[i].module];
if(stages[i]->ShaderName.count == 0)
stages[i]->name = m_pDriver->m_CreationInfo.m_Names[p.shaders[i].module];
if(stages[i]->name.count == 0)
{
stages[i]->customName = false;
stages[i]->ShaderName = StringFormat::Fmt("Shader %llu", stages[i]->Object);
stages[i]->name = StringFormat::Fmt("Shader %llu", stages[i]->Object);
}
stages[i]->stage = StageFromIndex(i);
@@ -3588,12 +3588,12 @@ void VulkanReplay::SavePipelineState()
el.sampler = rm->GetOriginalID(el.sampler);
el.customSamplerName = true;
el.SamplerName = m_pDriver->m_CreationInfo.m_Names[liveId];
if(el.SamplerName.count == 0)
el.customName = true;
el.name = m_pDriver->m_CreationInfo.m_Names[liveId];
if(el.name.count == 0)
{
el.customSamplerName = false;
el.SamplerName = StringFormat::Fmt("Sampler %llu", el.sampler);
el.customName = false;
el.name = StringFormat::Fmt("Sampler %llu", el.sampler);
}
// sampler info