Skip to content

Commit 7f48b6f

Browse files
committed
review: update naming to RootDescriptor
1 parent ab39042 commit 7f48b6f

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

clang/unittests/Parse/ParseHLSLRootSignatureTest.cpp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ TEST_F(ParseHLSLRootSignatureTest, ValidParseRootParamsTest) {
375375
ASSERT_EQ(std::get<RootParam>(Elem).Reg.Number, 0u);
376376
ASSERT_EQ(std::get<RootParam>(Elem).Space, 0u);
377377
ASSERT_EQ(std::get<RootParam>(Elem).Visibility, ShaderVisibility::All);
378-
ASSERT_EQ(std::get<RootParam>(Elem).Flags,
378+
ASSERT_EQ(std::get<RootDescriptor>(Elem).Flags,
379379
RootDescriptorFlags::DataStaticWhileSetAtExecute);
380380

381381
Elem = Elements[1];
@@ -385,7 +385,8 @@ TEST_F(ParseHLSLRootSignatureTest, ValidParseRootParamsTest) {
385385
ASSERT_EQ(std::get<RootParam>(Elem).Reg.Number, 42u);
386386
ASSERT_EQ(std::get<RootParam>(Elem).Space, 4u);
387387
ASSERT_EQ(std::get<RootParam>(Elem).Visibility, ShaderVisibility::Geometry);
388-
ASSERT_EQ(std::get<RootParam>(Elem).Flags, RootDescriptorFlags::ValidFlags);
388+
ASSERT_EQ(std::get<RootDescriptor>(Elem).Flags,
389+
RootDescriptorFlags::ValidFlags);
389390

390391
Elem = Elements[2];
391392
ASSERT_TRUE(std::holds_alternative<RootParam>(Elem));
@@ -394,14 +395,16 @@ TEST_F(ParseHLSLRootSignatureTest, ValidParseRootParamsTest) {
394395
ASSERT_EQ(std::get<RootParam>(Elem).Reg.Number, 34893247u);
395396
ASSERT_EQ(std::get<RootParam>(Elem).Space, 0u);
396397
ASSERT_EQ(std::get<RootParam>(Elem).Visibility, ShaderVisibility::Hull);
397-
ASSERT_EQ(std::get<RootParam>(Elem).Flags, RootDescriptorFlags::DataVolatile);
398+
ASSERT_EQ(std::get<RootDescriptor>(Elem).Flags,
399+
RootDescriptorFlags::DataVolatile);
398400

399401
Elem = Elements[3];
400-
ASSERT_EQ(std::get<RootParam>(Elem).Reg.ViewType, RegisterType::BReg);
401-
ASSERT_EQ(std::get<RootParam>(Elem).Reg.Number, 0u);
402-
ASSERT_EQ(std::get<RootParam>(Elem).Space, 0u);
403-
ASSERT_EQ(std::get<RootParam>(Elem).Visibility, ShaderVisibility::All);
404-
ASSERT_EQ(std::get<RootParam>(Elem).Flags, RootDescriptorFlags::None);
402+
ASSERT_EQ(std::get<RootDescriptor>(Elem).Type, DescriptorType::CBuffer);
403+
ASSERT_EQ(std::get<RootDescriptor>(Elem).Reg.ViewType, RegisterType::BReg);
404+
ASSERT_EQ(std::get<RootDescriptor>(Elem).Reg.Number, 0u);
405+
ASSERT_EQ(std::get<RootDescriptor>(Elem).Space, 0u);
406+
ASSERT_EQ(std::get<RootDescriptor>(Elem).Visibility, ShaderVisibility::All);
407+
ASSERT_EQ(std::get<RootDescriptor>(Elem).Flags, RootDescriptorFlags::None);
405408

406409
ASSERT_TRUE(Consumer->isSatisfied());
407410
}

0 commit comments

Comments
 (0)