Skip to content

Commit fefe820

Browse files
author
joaosaffran
committed
remove value
1 parent bce790c commit fefe820

File tree

2 files changed

+19
-29
lines changed

2 files changed

+19
-29
lines changed

llvm/include/llvm/BinaryFormat/DXContainerConstants.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ DESCRIPTOR_RANGE(0, SRV)
106106
DESCRIPTOR_RANGE(1, UAV)
107107
DESCRIPTOR_RANGE(2, CBV)
108108
DESCRIPTOR_RANGE(3, Sampler)
109-
DESCRIPTOR_RANGE(4, NONE)
110109
#undef DESCRIPTOR_RANGE
111110
#endif // DESCRIPTOR_RANGE
112111

llvm/lib/Target/DirectX/DXILRootSignature.cpp

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -564,63 +564,54 @@ PreservedAnalyses RootSignatureAnalysisPrinter::run(Module &M,
564564
continue;
565565
const auto &RS = It->second;
566566
OS << "Definition for '" << F.getName() << "':\n";
567-
568567
// start root signature header
569-
OS << "Flags: " << format_hex(RS.Flags, 8) << "\n";
570-
OS << "Version: " << RS.Version << "\n";
571-
OS << "RootParametersOffset: " << RS.RootParameterOffset << "\n";
572-
OS << "NumParameters: " << RS.ParametersContainer.size() << "\n";
568+
OS << "Flags: " << format_hex(RS.Flags, 8) << "\n"
569+
<< "Version: " << RS.Version << "\n"
570+
<< "RootParametersOffset: " << RS.RootParameterOffset << "\n"
571+
<< "NumParameters: " << RS.ParametersContainer.size() << "\n";
573572
for (size_t I = 0; I < RS.ParametersContainer.size(); I++) {
574573
const auto &[Type, Loc] =
575574
RS.ParametersContainer.getTypeAndLocForParameter(I);
576575
const dxbc::RTS0::v1::RootParameterHeader Header =
577576
RS.ParametersContainer.getHeader(I);
578577

579-
OS << "- Parameter Type: " << Type << "\n";
580-
OS << indent(2) << "Shader Visibility: " << Header.ShaderVisibility
581-
<< "\n";
578+
OS << "- Parameter Type: " << Type << "\n"
579+
<< " Shader Visibility: " << Header.ShaderVisibility << "\n";
582580

583581
switch (Type) {
584582
case llvm::to_underlying(dxbc::RootParameterType::Constants32Bit): {
585583
const dxbc::RTS0::v1::RootConstants &Constants =
586584
RS.ParametersContainer.getConstant(Loc);
587-
OS << indent(2) << "Register Space: " << Constants.RegisterSpace
588-
<< "\n";
589-
OS << indent(2) << "Shader Register: " << Constants.ShaderRegister
590-
<< "\n";
591-
OS << indent(2) << "Num 32 Bit Values: " << Constants.Num32BitValues
592-
<< "\n";
585+
OS << " Register Space: " << Constants.RegisterSpace << "\n"
586+
<< " Shader Register: " << Constants.ShaderRegister << "\n"
587+
<< " Num 32 Bit Values: " << Constants.Num32BitValues << "\n";
593588
break;
594589
}
595590
case llvm::to_underlying(dxbc::RootParameterType::CBV):
596591
case llvm::to_underlying(dxbc::RootParameterType::UAV):
597592
case llvm::to_underlying(dxbc::RootParameterType::SRV): {
598593
const dxbc::RTS0::v2::RootDescriptor &Descriptor =
599594
RS.ParametersContainer.getRootDescriptor(Loc);
600-
OS << indent(2) << "Register Space: " << Descriptor.RegisterSpace
601-
<< "\n";
602-
OS << indent(2) << "Shader Register: " << Descriptor.ShaderRegister
603-
<< "\n";
595+
OS << " Register Space: " << Descriptor.RegisterSpace << "\n"
596+
<< " Shader Register: " << Descriptor.ShaderRegister << "\n";
604597
if (RS.Version > 1)
605-
OS << indent(2) << "Flags: " << Descriptor.Flags << "\n";
598+
OS << " Flags: " << Descriptor.Flags << "\n";
606599
break;
607600
}
608601
case llvm::to_underlying(dxbc::RootParameterType::DescriptorTable): {
609602
const mcdxbc::DescriptorTable &Table =
610603
RS.ParametersContainer.getDescriptorTable(Loc);
611-
OS << indent(2) << "NumRanges: " << Table.Ranges.size() << "\n";
604+
OS << " NumRanges: " << Table.Ranges.size() << "\n";
612605

613606
for (const dxbc::RTS0::v2::DescriptorRange Range : Table) {
614-
OS << indent(2) << "- Range Type: " << Range.RangeType << "\n";
615-
OS << indent(4) << "Register Space: " << Range.RegisterSpace << "\n";
616-
OS << indent(4)
617-
<< "Base Shader Register: " << Range.BaseShaderRegister << "\n";
618-
OS << indent(4) << "Num Descriptors: " << Range.NumDescriptors
619-
<< "\n";
620-
OS << indent(4) << "Offset In Descriptors From Table Start: "
607+
OS << " - Range Type: " << Range.RangeType << "\n"
608+
<< " Register Space: " << Range.RegisterSpace << "\n"
609+
<< " Base Shader Register: " << Range.BaseShaderRegister << "\n"
610+
<< " Num Descriptors: " << Range.NumDescriptors << "\n"
611+
<< " Offset In Descriptors From Table Start: "
621612
<< Range.OffsetInDescriptorsFromTableStart << "\n";
622613
if (RS.Version > 1)
623-
OS << indent(4) << "Flags: " << Range.Flags << "\n";
614+
OS << " Flags: " << Range.Flags << "\n";
624615
}
625616
break;
626617
}

0 commit comments

Comments
 (0)