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

Set warning level on SPIR-V files in VS project

Browse Source
This commit is contained in:
baldurk
2019-08-13 19:11:01 +01:00
parent 759d034def
commit e71f986f84
3 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj
+30 -5
View File
@@ -161,11 +161,36 @@
<PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
<ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="spirv_editor.cpp" />
<ClCompile Include="spirv_processor.cpp" />
<ClCompile Include="spirv_reflect.cpp" />
<ClCompile Include="spirv_gen.cpp" />
<ClCompile Include="spirv_stringise.cpp" />
<ClCompile Include="spirv_editor.cpp">
<WarningLevel>Level4</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
<ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="spirv_processor.cpp">
<WarningLevel>Level4</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
<ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="spirv_reflect.cpp">
<WarningLevel>Level4</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
<ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="spirv_gen.cpp">
<WarningLevel>Level4</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
<ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="spirv_stringise.cpp">
<WarningLevel>Level4</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
<ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\3rdparty\glslang\glslang\Include\arrays.h" />
renderdoc/driver/shaders/spirv/spirv_editor.cpp
+2 -1
View File
@@ -372,7 +372,8 @@ void Editor::RegisterOp(Iter it)
}
else if(opdata.op == Op::TypeSampler)
{
samplerTypeToId[Sampler()] = opdata.result;
Sampler s;
samplerTypeToId[s] = opdata.result;
}
else if(opdata.op == Op::TypeSampledImage)
{
renderdoc/driver/shaders/spirv/spirv_reflect.cpp
+3 -3
View File
@@ -1911,9 +1911,9 @@ void Reflector::MakeConstantBlockVariable(ShaderConstant &outConst, const DataTy
outConst.type.descriptor.arrayByteStride = decorations[curType->id].arrayStride;
if(varDecorations.matrixStride != ~0U)
outConst.type.descriptor.matrixByteStride = varDecorations.matrixStride;
outConst.type.descriptor.matrixByteStride = varDecorations.matrixStride & 0xff;
else if(decorations[curType->id].matrixStride != ~0U)
outConst.type.descriptor.matrixByteStride = decorations[curType->id].matrixStride;
outConst.type.descriptor.matrixByteStride = decorations[curType->id].matrixStride & 0xff;
curType = &dataTypes[curType->InnerType()];
}
@@ -1926,7 +1926,7 @@ void Reflector::MakeConstantBlockVariable(ShaderConstant &outConst, const DataTy
(curType->type == DataType::VectorType || varDecorations.flags & Decorations::RowMajor);
if(varDecorations.matrixStride != ~0U)
outConst.type.descriptor.matrixByteStride = varDecorations.matrixStride;
outConst.type.descriptor.matrixByteStride = varDecorations.matrixStride & 0xff;
if(curType->type == DataType::MatrixType)
{