[NFC] Refactoring DXContainerYaml Root Parameter representation #138318
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,15 +53,15 @@ DXContainerYAML::RootSignatureYamlDesc::create( | |
| return createStringError(std::errc::invalid_argument, | ||
| "Invalid value for parameter type"); | ||
|
|
||
| RootParameterHeaderYaml Header(PH.ParameterType); | ||
| Header.Offset = PH.ParameterOffset; | ||
| Header.Type = PH.ParameterType; | ||
|
|
||
| if (!dxbc::isValidShaderVisibility(PH.ShaderVisibility)) | ||
| return createStringError(std::errc::invalid_argument, | ||
| "Invalid value for shader visibility"); | ||
|
|
||
| Header.Visibility = PH.ShaderVisibility; | ||
|
|
||
| llvm::Expected<object::DirectX::RootParameterView> ParamViewOrErr = | ||
| Data.getParameter(PH); | ||
|
|
@@ -75,29 +75,36 @@ DXContainerYAML::RootSignatureYamlDesc::create( | |
| return std::move(E); | ||
|
|
||
| auto Constants = *ConstantsOrErr; | ||
| RootParameterLocationYaml Location(Header); | ||
| RootConstantsYaml &ConstantYaml = | ||
| RootSigDesc.Parameters.getOrInsertConstants(Location); | ||
| RootSigDesc.Parameters.insertLocation(Location); | ||
| ConstantYaml.Num32BitValues = Constants.Num32BitValues; | ||
| ConstantYaml.ShaderRegister = Constants.ShaderRegister; | ||
| ConstantYaml.RegisterSpace = Constants.RegisterSpace; | ||
|
|
||
| } else if (auto *RDV = | ||
| dyn_cast<object::DirectX::RootDescriptorView>(&ParamView)) { | ||
| llvm::Expected<dxbc::RTS0::v2::RootDescriptor> DescriptorOrErr = | ||
| RDV->read(Version); | ||
| if (Error E = DescriptorOrErr.takeError()) | ||
| return std::move(E); | ||
| auto Descriptor = *DescriptorOrErr; | ||
| RootParameterLocationYaml Location(Header); | ||
| RootDescriptorYaml &YamlDescriptor = | ||
| RootSigDesc.Parameters.getOrInsertDescriptor(Location); | ||
| RootSigDesc.Parameters.insertLocation(Location); | ||
|
|
||
| YamlDescriptor.ShaderRegister = Descriptor.ShaderRegister; | ||
| YamlDescriptor.RegisterSpace = Descriptor.RegisterSpace; | ||
| if (Version > 1) { | ||
| #define ROOT_DESCRIPTOR_FLAG(Num, Val) \ | ||
| YamlDescriptor.Val = \ | ||
| (Descriptor.Flags & \ | ||
| llvm::to_underlying(dxbc::RootDescriptorFlag::Val)) > 0; | ||
| #include "llvm/BinaryFormat/DXContainerConstants.def" | ||
| } | ||
| } | ||
| } | ||
| #define ROOT_ELEMENT_FLAG(Num, Val) \ | ||
| RootSigDesc.Val = \ | ||
|
|
@@ -283,49 +290,57 @@ void MappingTraits<DXContainerYAML::Signature>::mapping( | |
| IO.mapRequired("Parameters", S.Parameters); | ||
| } | ||
|
|
||
| void MappingTraits<DXContainerYAML::RootSignatureYamlDesc>::mapping( | ||
| IO &IO, DXContainerYAML::RootSignatureYamlDesc &S) { | ||
| IO.mapRequired("Version", S.Version); | ||
| IO.mapRequired("NumRootParameters", S.NumRootParameters); | ||
| IO.mapRequired("RootParametersOffset", S.RootParametersOffset); | ||
| IO.mapRequired("NumStaticSamplers", S.NumStaticSamplers); | ||
| IO.mapRequired("StaticSamplersOffset", S.StaticSamplersOffset); | ||
| IO.mapRequired("Parameters", S.Parameters.Locations, S); | ||
| #define ROOT_ELEMENT_FLAG(Num, Val) IO.mapOptional(#Val, S.Val, false); | ||
| #include "llvm/BinaryFormat/DXContainerConstants.def" | ||
| } | ||
|
|
||
| void MappingContextTraits<DXContainerYAML::RootParameterLocationYaml, | ||
| DXContainerYAML::RootSignatureYamlDesc>:: | ||
| mapping(IO &IO, DXContainerYAML::RootParameterLocationYaml &L, | ||
| DXContainerYAML::RootSignatureYamlDesc &S) { | ||
| IO.mapRequired("ParameterType", L.Header.Type); | ||
| IO.mapRequired("ShaderVisibility", L.Header.Visibility); | ||
|
|
||
| switch (L.Header.Type) { | ||
| case llvm::to_underlying(dxbc::RootParameterType::Constants32Bit): { | ||
| DXContainerYAML::RootConstantsYaml &Constants = | ||
| S.Parameters.getOrInsertConstants(L); | ||
| IO.mapRequired("Constants", Constants); | ||
| break; | ||
| } | ||
| case llvm::to_underlying(dxbc::RootParameterType::CBV): | ||
| case llvm::to_underlying(dxbc::RootParameterType::SRV): | ||
| case llvm::to_underlying(dxbc::RootParameterType::UAV): { | ||
| DXContainerYAML::RootDescriptorYaml &Descriptor = | ||
| S.Parameters.getOrInsertDescriptor(L); | ||
| IO.mapRequired("Descriptor", Descriptor); | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| void MappingTraits<llvm::DXContainerYAML::RootConstantsYaml>::mapping( | ||
| IO &IO, llvm::DXContainerYAML::RootConstantsYaml &C) { | ||
| IO.mapRequired("Num32BitValues", C.Num32BitValues); | ||
| IO.mapRequired("RegisterSpace", C.RegisterSpace); | ||
| IO.mapRequired("ShaderRegister", C.ShaderRegister); | ||
| } | ||
|
|
||
| void MappingTraits<llvm::DXContainerYAML::RootDescriptorYaml>::mapping( | ||
| IO &IO, llvm::DXContainerYAML::RootDescriptorYaml &D) { | ||
| IO.mapRequired("RegisterSpace", D.RegisterSpace); | ||
| IO.mapRequired("ShaderRegister", D.ShaderRegister); | ||
| #define ROOT_DESCRIPTOR_FLAG(Num, Val) IO.mapOptional(#Val, D.Val, false); | ||
| #include "llvm/BinaryFormat/DXContainerConstants.def" | ||
| } | ||
|
|
||
| void MappingTraits<DXContainerYAML::Part>::mapping(IO &IO, | ||
| DXContainerYAML::Part &P) { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like a funny whitespace change here, please double check.