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

Add stub HLSL generation for editing D3D shaders that have no source

Browse Source
This commit is contained in:
baldurk
2017-07-06 16:34:48 +01:00
parent 575580e13b
commit f8b458176a
7 changed files with 192 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/QRDUtils.cpp
+33 -1
View File
@@ -215,7 +215,39 @@ QString D3DSemanticString(const SigParameter &sig)
if(sig.systemValue == ShaderBuiltin::Undefined)
return ToQStr(sig.semanticIdxName);
QString ret = ToQStr(sig.systemValue);
QString sysValues[ENUM_ARRAY_SIZE(ShaderBuiltin)] = {
lit("SV_Undefined"),
lit("SV_Position"),
lit("Unsupported (PointSize)"),
lit("SV_ClipDistance"),
lit("SV_CullDistance"),
lit("SV_RenderTargetIndex"),
lit("SV_ViewportIndex"),
lit("SV_VertexID"),
lit("SV_PrimitiveID"),
lit("SV_InstanceID"),
lit("Unsupported (DispatchSize)"),
lit("SV_DispatchThreadID"),
lit("SV_GroupID"),
lit("SV_GroupIndex"),
lit("SV_GroupThreadID"),
lit("SV_GSInstanceID"),
lit("SV_OutputControlPointID"),
lit("SV_DomainLocation"),
lit("SV_IsFrontFace"),
lit("SV_Coverage"),
lit("Unsupported (SamplePosition)"),
lit("SV_SampleIndex"),
lit("Unsupported (PatchNumVertices)"),
lit("SV_TessFactor"),
lit("SV_InsideTessFactor"),
lit("SV_Target"),
lit("SV_Depth"),
lit("SV_DepthGreaterEqual"),
lit("SV_DepthLessEqual"),
};
QString ret = sysValues[size_t(sig.systemValue)];
// need to include the index if it's a system value semantic that's numbered
if(sig.systemValue == ShaderBuiltin::ColorOutput ||
qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
+1 -4
View File
@@ -2259,11 +2259,8 @@ void D3D11PipelineStateViewer::shaderEdit_clicked()
if(!hasOrigSource)
{
QString hlsl = lit("// TODO - generate stub HLSL");
mainfile = lit("generated.hlsl");
files[mainfile] = hlsl;
files[mainfile] = m_Common.GenerateHLSLStub(shaderDetails, entryFunc);
}
if(files.empty())
qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
+1 -4
View File
@@ -2144,11 +2144,8 @@ void D3D12PipelineStateViewer::shaderEdit_clicked()
if(!hasOrigSource)
{
QString hlsl = lit("// TODO - generate stub HLSL");
mainfile = lit("generated.hlsl");
files[mainfile] = hlsl;
files[mainfile] = m_Common.GenerateHLSLStub(shaderDetails, entryFunc);
}
if(files.empty())
qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp
+1
View File
@@ -2277,6 +2277,7 @@ void GLPipelineStateViewer::shaderEdit_clicked()
if(!hasOrigSource)
{
// this would only happen if the GL program is uploading SPIR-V instead of GLSL.
QString glsl = lit("// TODO - disassemble SPIR-V");
mainfile = lit("generated.glsl");
qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp
+148
View File
@@ -558,6 +558,154 @@ bool PipelineStateViewer::PrepareShaderEditing(const ShaderReflection *shaderDet
return false;
}
void PipelineStateViewer::MakeShaderVariablesHLSL(bool cbufferContents,
const rdctype::array<ShaderConstant> &vars,
QString &struct_contents, QString &struct_defs)
{
for(const ShaderConstant &v : vars)
{
if(v.type.members.count > 0)
{
QString def = lit("struct %1 {\n").arg(ToQStr(v.type.descriptor.name));
if(!struct_defs.contains(def))
{
QString contents;
MakeShaderVariablesHLSL(false, v.type.members, contents, struct_defs);
struct_defs += def + contents + lit("};\n\n");
}
}
struct_contents += lit("\t%1 %2").arg(ToQStr(v.type.descriptor.name)).arg(ToQStr(v.name));
char comp = 'x';
if(v.reg.comp == 1)
comp = 'y';
if(v.reg.comp == 2)
comp = 'z';
if(v.reg.comp == 3)
comp = 'w';
if(cbufferContents)
struct_contents += lit(" : packoffset(c%1.%2);").arg(v.reg.vec).arg(QLatin1Char(comp));
else
struct_contents += lit(";");
struct_contents += lit("\n");
}
}
QString PipelineStateViewer::GenerateHLSLStub(const ShaderReflection *shaderDetails,
const QString &entryFunc)
{
QString hlsl = lit("// No HLSL available - function stub generated\n\n");
const QString textureDim[ENUM_ARRAY_SIZE(TextureDim)] = {
lit("Unknown"), lit("Buffer"), lit("Texture1D"), lit("Texture1DArray"),
lit("Texture2D"), lit("TextureRect"), lit("Texture2DArray"), lit("Texture2DMS"),
lit("Texture2DMSArray"), lit("Texture3D"), lit("TextureCube"), lit("TextureCubeArray"),
};
for(int i = 0; i < 2; i++)
{
const rdctype::array<ShaderResource> &resources =
(i == 0 ? shaderDetails->ReadOnlyResources : shaderDetails->ReadWriteResources);
for(const ShaderResource &res : resources)
{
if(res.IsSampler)
{
hlsl += lit("//SamplerComparisonState %1 : register(s%2); // can't disambiguate\n"
"SamplerState %1 : register(s%2); // can't disambiguate\n")
.arg(ToQStr(res.name))
.arg(res.bindPoint);
}
else
{
char regChar = 't';
if(i == 1)
{
hlsl += lit("RW");
regChar = 'u';
}
if(res.IsTexture)
{
hlsl += lit("%1<%2> %3 : register(%4%5);\n")
.arg(textureDim[(size_t)res.resType])
.arg(ToQStr(res.variableType.descriptor.name))
.arg(ToQStr(res.name))
.arg(QLatin1Char(regChar))
.arg(res.bindPoint);
}
else
{
if(res.variableType.descriptor.rows > 1)
hlsl += lit("Structured");
hlsl += lit("Buffer<%1> %2 : register(%3%4);\n")
.arg(ToQStr(res.variableType.descriptor.name))
.arg(ToQStr(res.name))
.arg(QLatin1Char(regChar))
.arg(res.bindPoint);
}
}
}
}
hlsl += lit("\n\n");
QString cbuffers;
int cbufIdx = 0;
for(const ConstantBlock &cbuf : shaderDetails->ConstantBlocks)
{
if(cbuf.name.count > 0 && cbuf.variables.count > 0)
{
QString cbufName = ToQStr(cbuf.name);
if(cbufName == lit("$Globals"))
cbufName = lit("_Globals");
cbuffers += lit("cbuffer %1 : register(b%2) {\n").arg(cbufName).arg(cbuf.bindPoint);
MakeShaderVariablesHLSL(true, cbuf.variables, cbuffers, hlsl);
cbuffers += lit("};\n\n");
}
cbufIdx++;
}
hlsl += cbuffers;
hlsl += lit("\n\n");
hlsl += lit("struct InputStruct {\n");
for(const SigParameter &sig : shaderDetails->InputSig)
hlsl += lit("\t%1 %2 : %3;\n")
.arg(TypeString(sig))
.arg(sig.varName.count > 0 ? ToQStr(sig.varName) : lit("param%1").arg(sig.regIndex))
.arg(D3DSemanticString(sig));
hlsl += lit("};\n\n");
hlsl += lit("struct OutputStruct {\n");
for(const SigParameter &sig : shaderDetails->OutputSig)
hlsl += lit("\t%1 %2 : %3;\n")
.arg(TypeString(sig))
.arg(sig.varName.count > 0 ? ToQStr(sig.varName) : lit("param%1").arg(sig.regIndex))
.arg(D3DSemanticString(sig));
hlsl += lit("};\n\n");
hlsl += lit("OutputStruct %1(in InputStruct IN)\n"
"{\n"
"\tOutputStruct OUT = (OutputStruct)0;\n"
"\n"
"\t// ...\n"
"\n"
"\treturn OUT;\n"
"}\n")
.arg(entryFunc);
return hlsl;
}
void PipelineStateViewer::EditShader(ShaderStage shaderType, ResourceId id,
const ShaderReflection *shaderDetails, const QString &entryFunc,
const QStringMap &files, const QString &mainfile)
qrenderdoc/Windows/PipelineState/PipelineStateViewer.h
+4
View File
@@ -67,6 +67,7 @@ public:
bool PrepareShaderEditing(const ShaderReflection *shaderDetails, QString &entryFunc,
QStringMap &files, QString &mainfile);
QString GenerateHLSLStub(const ShaderReflection *shaderDetails, const QString &entryFunc);
void EditShader(ShaderStage shaderType, ResourceId id, const ShaderReflection *shaderDetails,
const QString &entryFunc, const QStringMap &files, const QString &mainfile);
@@ -83,6 +84,9 @@ private:
Ui::PipelineStateViewer *ui;
ICaptureContext &m_Ctx;
void MakeShaderVariablesHLSL(bool cbufferContents, const rdctype::array<ShaderConstant> &vars,
QString &struct_contents, QString &struct_defs);
QPixmap m_TopoPixmaps[(int)Topology::PatchList + 1];
void setToD3D11();
renderdoc/api/replay/replay_enums.h
+4
View File
@@ -693,6 +693,7 @@ to apply to multiple related things - see :data:`ClipDistance`, :data:`CullDista
enum class ShaderBuiltin : uint32_t
{
Undefined = 0,
First = Undefined,
Position,
PointSize,
ClipDistance,
@@ -721,8 +722,11 @@ enum class ShaderBuiltin : uint32_t
DepthOutput,
DepthOutputGreaterEqual,
DepthOutputLessEqual,
Count,
};
ITERABLE_OPERATORS(ShaderBuiltin);
// replay_render.h
DOCUMENT(R"(The type of :class:`ReplayOutput` to create