Skip to content

Commit efcd873

Browse files
committed
remove test
1 parent 73e6bb5 commit efcd873

File tree

4 files changed

+8
-25
lines changed

4 files changed

+8
-25
lines changed

llvm/include/llvm/Frontend/HLSL/RootSignatureValidations.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ LLVM_ABI bool verifyRangeType(uint32_t Type);
3333
LLVM_ABI bool verifyDescriptorRangeFlag(uint32_t Version,
3434
dxil::ResourceClass Type,
3535
dxbc::DescriptorRangeFlags FlagsVal);
36-
LLVM_ABI bool verifyStaticSamplerFlags(uint32_t Version,
37-
dxbc::StaticSamplerFlags Flags);
36+
LLVM_ABI bool verifyStaticSamplerFlags(uint32_t Version, uint32_t FlagsNumber);
3837
LLVM_ABI bool verifyNumDescriptors(uint32_t NumDescriptors);
3938
LLVM_ABI bool verifyMipLODBias(float MipLODBias);
4039
LLVM_ABI bool verifyMaxAnisotropy(uint32_t MaxAnisotropy);

llvm/lib/Frontend/HLSL/RootSignatureMetadata.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -652,8 +652,7 @@ Error MetadataParser::validateRootSignature(
652652
make_error<RootSignatureValidationError<uint32_t>>(
653653
"RegisterSpace", Sampler.RegisterSpace));
654654

655-
if (!hlsl::rootsig::verifyStaticSamplerFlags(
656-
RSD.Version, dxbc::StaticSamplerFlags(Sampler.Flags)))
655+
if (!hlsl::rootsig::verifyStaticSamplerFlags(RSD.Version, Sampler.Flags))
657656
DeferredErrs =
658657
joinErrors(std::move(DeferredErrs),
659658
make_error<RootSignatureValidationError<uint32_t>>(

llvm/lib/Frontend/HLSL/RootSignatureValidations.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,13 @@ bool verifyDescriptorRangeFlag(uint32_t Version, dxil::ResourceClass Type,
113113
return (Flags & ~Mask) == FlagT::None;
114114
}
115115

116-
bool verifyStaticSamplerFlags(uint32_t Version,
117-
dxbc::StaticSamplerFlags Flags) {
116+
bool verifyStaticSamplerFlags(uint32_t Version, uint32_t FlagsNumber) {
117+
uint32_t LargestValue = llvm::to_underlying(
118+
dxbc::StaticSamplerFlags::LLVM_BITMASK_LARGEST_ENUMERATOR);
119+
if (FlagsNumber >= NextPowerOf2(LargestValue))
120+
return false;
118121

122+
dxbc::StaticSamplerFlags Flags = dxbc::StaticSamplerFlags(FlagsNumber);
119123
if (Version <= 2)
120124
return Flags == dxbc::StaticSamplerFlags::None;
121125

llvm/test/CodeGen/DirectX/ContainerData/RootSignature-StaticSamplers-Invalid-Flag.ll

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)