Skip to content

Commit 38f339b

Browse files
committed
review: enumerate valid flags
1 parent 82c7ac7 commit 38f339b

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

clang/unittests/Parse/ParseHLSLRootSignatureTest.cpp

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,10 @@ TEST_F(ParseHLSLRootSignatureTest, ValidParseDTClausesTest) {
204204
ASSERT_EQ(std::get<DescriptorTableClause>(Elem).Space, 0u);
205205
ASSERT_EQ(std::get<DescriptorTableClause>(Elem).Offset,
206206
DescriptorTableOffsetAppend);
207-
auto ValidDescriptorRangeFlags = FlagT(0x1000f);
207+
auto ValidDescriptorRangeFlags =
208+
FlagT::DescriptorsVolatile | FlagT::DataVolatile |
209+
FlagT::DataStaticWhileSetAtExecute | FlagT::DataStatic |
210+
FlagT::DescriptorsStaticKeepingBufferBoundsChecks;
208211
ASSERT_EQ(std::get<DescriptorTableClause>(Elem).Flags,
209212
ValidDescriptorRangeFlags);
210213

@@ -415,8 +418,9 @@ TEST_F(ParseHLSLRootSignatureTest, ValidSamplerFlagsTest) {
415418
RootElement Elem = Elements[0];
416419
ASSERT_TRUE(std::holds_alternative<DescriptorTableClause>(Elem));
417420
ASSERT_EQ(std::get<DescriptorTableClause>(Elem).Type, ClauseType::Sampler);
418-
ASSERT_EQ(std::get<DescriptorTableClause>(Elem).Flags,
419-
llvm::dxbc::DescriptorRangeFlags::DescriptorsVolatile);
421+
auto ValidSamplerFlags =
422+
llvm::dxbc::DescriptorRangeFlags::DescriptorsVolatile;
423+
ASSERT_EQ(std::get<DescriptorTableClause>(Elem).Flags, ValidSamplerFlags);
420424

421425
ASSERT_TRUE(Consumer->isSatisfied());
422426
}
@@ -511,7 +515,14 @@ TEST_F(ParseHLSLRootSignatureTest, ValidParseRootFlagsTest) {
511515

512516
Elem = Elements[2];
513517
ASSERT_TRUE(std::holds_alternative<FlagT>(Elem));
514-
auto ValidRootFlags = FlagT(0xfff);
518+
auto ValidRootFlags =
519+
FlagT::AllowInputAssemblerInputLayout |
520+
FlagT::DenyVertexShaderRootAccess | FlagT::DenyHullShaderRootAccess |
521+
FlagT::DenyDomainShaderRootAccess | FlagT::DenyGeometryShaderRootAccess |
522+
FlagT::DenyPixelShaderRootAccess | FlagT::AllowStreamOutput |
523+
FlagT::LocalRootSignature | FlagT::DenyAmplificationShaderRootAccess |
524+
FlagT::DenyMeshShaderRootAccess | FlagT::CBVSRVUAVHeapDirectlyIndexed |
525+
FlagT::SamplerHeapDirectlyIndexed;
515526
ASSERT_EQ(std::get<FlagT>(Elem), ValidRootFlags);
516527

517528
ASSERT_TRUE(Consumer->isSatisfied());
@@ -562,7 +573,9 @@ TEST_F(ParseHLSLRootSignatureTest, ValidParseRootDescriptorsTest) {
562573
ASSERT_EQ(std::get<RootDescriptor>(Elem).Space, 4u);
563574
ASSERT_EQ(std::get<RootDescriptor>(Elem).Visibility,
564575
llvm::dxbc::ShaderVisibility::Geometry);
565-
auto ValidRootDescriptorFlags = FlagT(0xe);
576+
auto ValidRootDescriptorFlags = FlagT::DataVolatile |
577+
FlagT::DataStaticWhileSetAtExecute |
578+
FlagT::DataStatic;
566579
ASSERT_EQ(std::get<RootDescriptor>(Elem).Flags, ValidRootDescriptorFlags);
567580

568581
Elem = Elements[2];

0 commit comments

Comments
 (0)