Skip to content

Commit 57fd710

Browse files
committed
fix test
1 parent 787c776 commit 57fd710

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

llvm/lib/ObjectYAML/DXContainerYAML.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,8 +521,8 @@ void MappingTraits<llvm::DXContainerYAML::StaticSamplerYamlDesc>::mapping(
521521
IO.mapRequired("ShaderRegister", S.ShaderRegister);
522522
IO.mapRequired("RegisterSpace", S.RegisterSpace);
523523
IO.mapRequired("ShaderVisibility", S.ShaderVisibility);
524-
525-
#define STATIC_SAMPLER_FLAG_FLAG(Num, Val) IO.mapOptional(#Val, S.Val, false);
524+
#define STATIC_SAMPLER_FLAG(Num, Enum, Flag) \
525+
IO.mapOptional(#Flag, S.Enum, false);
526526
#include "llvm/BinaryFormat/DXContainerConstants.def"
527527
}
528528

llvm/unittests/ObjectYAML/DXContainerYAMLTest.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ TEST(RootSignature, ParseStaticSamplers) {
528528
}
529529

530530
TEST(RootSignature, ParseStaticSamplersV13) {
531-
SmallString<128> Storage;
531+
SmallString<160> Storage;
532532

533533
// First read a fully explicit yaml with all sizes and offsets provided
534534
ASSERT_TRUE(convert(Storage, R"(--- !dxcontainer
@@ -575,14 +575,14 @@ TEST(RootSignature, ParseStaticSamplersV13) {
575575
0x90, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00,
576576
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
577577
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
578-
0x52, 0x54, 0x53, 0x30, 0x4c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
578+
0x52, 0x54, 0x53, 0x30, 0x4c, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
579579
0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
580580
0x18, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
581581
0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
582582
0xa4, 0x70, 0x9d, 0x3f, 0x14, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
583583
0x00, 0x00, 0x00, 0x00, 0x85, 0xeb, 0x91, 0x40, 0x66, 0x66, 0x0e, 0x41,
584584
0x1f, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00,
585-
0x01};
585+
0x01, 0x00, 0x00, 0x00};
586586

587587
EXPECT_EQ(Storage.size(), 148U);
588588
EXPECT_TRUE(memcmp(Buffer, Storage.data(), 148U) == 0);

0 commit comments

Comments
 (0)