Skip to content

Commit ddf9945

Browse files
committed
changing size and remove untested parameters
1 parent a08c05e commit ddf9945

File tree

2 files changed

+9
-18
lines changed

2 files changed

+9
-18
lines changed

llvm/include/llvm/BinaryFormat/DXContainer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,6 +822,7 @@ struct DescriptorRange {
822822
}
823823
};
824824
} // namespace v2
825+
825826
namespace v3 {
826827
struct StaticSampler : public v1::StaticSampler {
827828
uint32_t Flags;

llvm/unittests/ObjectYAML/DXContainerYAMLTest.cpp

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

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

533533
// First read a fully explicit yaml with all sizes and offsets provided
534534
ASSERT_TRUE(convert(Storage, R"(--- !dxcontainer
@@ -551,19 +551,9 @@ TEST(RootSignature, ParseStaticSamplersV13) {
551551
StaticSamplersOffset: 24
552552
Parameters: []
553553
Samplers:
554-
- Filter: MinLinearMagMipPoint
555-
AddressU: Wrap
556-
AddressV: Mirror
557-
AddressW: MirrorOnce
558-
MipLODBias: 1.23
559-
MaxAnisotropy: 20
560-
ComparisonFunc: LessEqual
561-
BorderColor: TransparentBlack
562-
MinLOD: 4.56
563-
MaxLOD: 8.90
564-
ShaderRegister: 31
554+
- ShaderRegister: 31
565555
RegisterSpace: 32
566-
ShaderVisibility: Mesh
556+
ShaderVisibility: All
567557
SAMPLER_FLAG_UINT_BORDER_COLOR: true
568558
AllowInputAssemblerInputLayout: true
569559
DenyGeometryShaderRootAccess: true
@@ -577,11 +567,11 @@ TEST(RootSignature, ParseStaticSamplersV13) {
577567
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
578568
0x52, 0x54, 0x53, 0x30, 0x4c, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
579569
0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
580-
0x18, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
581-
0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
582-
0xa4, 0x70, 0x9d, 0x3f, 0x14, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
583-
0x00, 0x00, 0x00, 0x00, 0x85, 0xeb, 0x91, 0x40, 0x66, 0x66, 0x0e, 0x41,
584-
0x1f, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00,
570+
0x18, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x55, 0x00, 0x00, 0x00,
571+
0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
572+
0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
573+
0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7f, 0x7f,
574+
0x1f, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
585575
0x01, 0x00, 0x00, 0x00};
586576

587577
EXPECT_EQ(Storage.size(), 148U);

0 commit comments

Comments
 (0)