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

Increase warning level on SPIR-V debugging source files

Browse Source
This commit is contained in:
baldurk
2020-10-20 11:07:56 +01:00
parent 4cdc46a5cf
commit d1bc1c68dc
3 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj
+18 -3
View File
@@ -157,9 +157,24 @@
<PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
<ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="spirv_debug.cpp" />
<ClCompile Include="spirv_debug_glsl450.cpp" />
<ClCompile Include="spirv_debug_setup.cpp" />
<ClCompile Include="spirv_debug.cpp">
<WarningLevel>Level4</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
<ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="spirv_debug_glsl450.cpp">
<WarningLevel>Level4</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
<ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="spirv_debug_setup.cpp">
<WarningLevel>Level4</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
<ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="spirv_disassemble.cpp">
<WarningLevel>Level4</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
renderdoc/driver/shaders/spirv/spirv_debug.cpp
+12 -12
View File
@@ -876,11 +876,11 @@ void ThreadState::StepNext(ShaderDebugState *state, const rdcarray<ThreadState>
for(size_t i = 0; i < construct.constituents.size(); i++)
{
ShaderVariable &mem = var.members[i];
var.members[i] = GetSrc(construct.constituents[i]);
mem = GetSrc(construct.constituents[i]);
if(!type.children[i].name.empty())
var.members[i].name = type.children[i].name;
mem.name = type.children[i].name;
else
var.members[i].name = StringFormat::Fmt("_child%zu", i);
mem.name = StringFormat::Fmt("_child%zu", i);
}
}
else if(type.type == DataType::VectorType)
@@ -888,8 +888,8 @@ void ThreadState::StepNext(ShaderDebugState *state, const rdcarray<ThreadState>
RDCASSERT(construct.constituents.size() <= 4);
var.type = type.scalar().Type();
var.rows = 1;
var.columns = RDCMAX(1U, type.vector().count);
var.rows = 1U;
var.columns = RDCMAX(1U, type.vector().count) & 0xff;
// it is possible to construct larger vectors from a collection of scalars and smaller
// vectors.
@@ -913,8 +913,8 @@ void ThreadState::StepNext(ShaderDebugState *state, const rdcarray<ThreadState>
{
// matrices are constructed from a list of columns
var.type = type.scalar().Type();
var.columns = RDCMAX(1U, type.matrix().count);
var.rows = RDCMAX(1U, type.vector().count);
var.columns = RDCMAX(1U, type.matrix().count) & 0xff;
var.rows = RDCMAX(1U, type.vector().count) & 0xff;
RDCASSERTEQUAL(var.columns, construct.constituents.size());
@@ -949,7 +949,7 @@ void ThreadState::StepNext(ShaderDebugState *state, const rdcarray<ThreadState>
var.type = type.scalar().Type();
var.rows = 1;
var.columns = RDCMAX(1U, (uint32_t)shuffle.components.size());
var.columns = RDCMAX(1U, (uint32_t)shuffle.components.size()) & 0xff;
ShaderVariable src1 = GetSrc(shuffle.vector1);
ShaderVariable src2 = GetSrc(shuffle.vector2);
@@ -1200,7 +1200,7 @@ void ThreadState::StepNext(ShaderDebugState *state, const rdcarray<ThreadState>
}
var.type = type.scalar().Type();
var.columns = type.vector().count;
var.columns = type.vector().count & 0xff;
var.value = ShaderValue();
byte *b = bytes.data();
@@ -2332,7 +2332,7 @@ void ThreadState::StepNext(ShaderDebugState *state, const rdcarray<ThreadState>
}
result.rows = 1;
result.columns = RDCMAX(1U, resultType.vector().count);
result.columns = RDCMAX(1U, resultType.vector().count) & 0xff;
SetDst(opdata.result, result);
break;
@@ -2409,7 +2409,7 @@ void ThreadState::StepNext(ShaderDebugState *state, const rdcarray<ThreadState>
}
result.rows = 1;
result.columns = RDCMAX(1U, resultType.vector().count);
result.columns = RDCMAX(1U, resultType.vector().count) & 0xff;
SetDst(read.result, result);
break;
@@ -2540,7 +2540,7 @@ void ThreadState::StepNext(ShaderDebugState *state, const rdcarray<ThreadState>
result.type = resultType.scalar().Type();
result.rows = 1;
result.columns = RDCMAX(1U, resultType.vector().count);
result.columns = RDCMAX(1U, resultType.vector().count) & 0xff;
result.value.u64v[0] = global.clock;
renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
+6 -8
View File
@@ -1542,7 +1542,7 @@ ShaderVariable Debugger::ReadFromPointer(const ShaderVariable &ptr) const
uint32_t scalar0 = (uint32_t)ptr.value.u64v[Scalar0VariableSlot];
uint32_t scalar1 = (uint32_t)ptr.value.u64v[Scalar1VariableSlot];
ShaderValue val;
ShaderValue val = {};
if(ret.rows > 1)
{
@@ -1637,8 +1637,6 @@ void Debugger::WriteThroughPointer(const ShaderVariable &ptr, const ShaderVariab
rdcspv::Id::fromWord(uint32_t(ptr.value.u64v[BufferPointerTypeIdVariableSlot]));
uint64_t byteOffset = ptr.value.u64v[BufferPointerByteOffsetVariableSlot];
const DataType &type = dataTypes[typeId];
BindpointIndex bind = storage->GetBinding();
bind.arrayIndex = (uint32_t)ptr.value.u64v[ArrayVariableSlot];
@@ -1974,10 +1972,10 @@ uint32_t Debugger::WalkVariable(
if(outVar)
{
outVar->type = type.scalar().Type();
outVar->rows = 1;
outVar->columns = RDCMAX(1U, type.vector().count);
outVar->rows = 1U;
outVar->columns = RDCMAX(1U, type.vector().count) & 0xff;
}
numLocations = 1;
numLocations = 1U;
break;
}
case DataType::MatrixType:
@@ -1985,8 +1983,8 @@ uint32_t Debugger::WalkVariable(
if(outVar)
{
outVar->type = type.scalar().Type();
outVar->columns = RDCMAX(1U, type.matrix().count);
outVar->rows = RDCMAX(1U, type.vector().count);
outVar->columns = RDCMAX(1U, type.matrix().count) & 0xff;
outVar->rows = RDCMAX(1U, type.vector().count) & 0xff;
}
numLocations = var.rows;
break;