Skip to content

Commit d186ebd

Browse files
Joao SaffranJoao Saffran
authored andcommitted
clean up
1 parent e5812ce commit d186ebd

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

llvm/lib/Target/DirectX/DXILPostOptimizationValidation.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -326,24 +326,24 @@ static bool validateRootSignatureBindings(Module &M,
326326
reportOverlappingRegisters(M, ReportedBinding, Overlaping);
327327
});
328328
bool HasBindings = false;
329-
SmallVector<ResourceInfo::ResourceBinding> RDs =
330-
getRootDescriptorsBindingInfo(RSD, Visibility);
331-
for (const auto &ResList :
332-
{std::make_pair(ResourceClass::SRV, DRM.srvs()),
333-
std::make_pair(ResourceClass::UAV, DRM.uavs()),
334-
std::make_pair(ResourceClass::CBuffer, DRM.cbuffers()),
335-
std::make_pair(ResourceClass::Sampler, DRM.samplers())}) {
336-
for (auto Res : ResList.second) {
337-
llvm::dxil::ResourceInfo::ResourceBinding ResBinding = Res.getBinding();
338-
llvm::hlsl::BindingInfo::BindingRange ResRange(
339-
ResBinding.LowerBound, ResBinding.LowerBound + ResBinding.Size);
340-
341-
if (!Info.isBound(ResList.first, ResBinding.Space, ResRange))
342-
reportRegNotBound(M, ResList.first, ResBinding);
343-
else
344-
HasBindings = true;
345-
}
346-
checkInvalidHandleTy(M, RDs, ResList.second);
329+
SmallVector<ResourceInfo::ResourceBinding> RDs =
330+
getRootDescriptorsBindingInfo(RSD, Visibility);
331+
for (const auto &ResList :
332+
{std::make_pair(ResourceClass::SRV, DRM.srvs()),
333+
std::make_pair(ResourceClass::UAV, DRM.uavs()),
334+
std::make_pair(ResourceClass::CBuffer, DRM.cbuffers()),
335+
std::make_pair(ResourceClass::Sampler, DRM.samplers())}) {
336+
for (auto Res : ResList.second) {
337+
llvm::dxil::ResourceInfo::ResourceBinding ResBinding = Res.getBinding();
338+
llvm::hlsl::BindingInfo::BindingRange ResRange(
339+
ResBinding.LowerBound, ResBinding.LowerBound + ResBinding.Size);
340+
341+
if (!Info.isBound(ResList.first, ResBinding.Space, ResRange))
342+
reportRegNotBound(M, ResList.first, ResBinding);
343+
else
344+
HasBindings = true;
345+
}
346+
checkInvalidHandleTy(M, RDs, ResList.second);
347347
}
348348
return HasBindings;
349349
}

llvm/test/CodeGen/DirectX/rootsignature-validation-deny-no-binding.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ attributes #0 = { noinline nounwind "exp-shader"="cs" "hlsl.numthreads"="1,2,1"
1313
!0 = !{ptr @CSMain, !1, i32 2}
1414
!1 = !{!2, !3, !4}
1515
!2 = !{!"RootConstants", i32 0, i32 2, i32 0, i32 4}
16-
!3 = !{ !"RootFlags", i32 294 } ; 32 = deny_pixel/hull/vertex/amplification_shader_root_access
16+
!3 = !{ !"RootFlags", i32 294 } ; 294 = deny_pixel/hull/vertex/amplification_shader_root_access
1717
!4 = !{ !"RootSRV", i32 0, i32 1, i32 0, i32 0 }

0 commit comments

Comments
 (0)