From 3d1cd3128439dc465fb605d93db1f21b4e4a4a74 Mon Sep 17 00:00:00 2001 From: Steven Perron Date: Fri, 21 Mar 2025 11:19:40 -0400 Subject: [PATCH] [SPIRV] Update submodules and fix test Updates the submodules. One test is updated because spirv-opt does not common the load of a sampler anymore to avoid using a value from a different basic block. --- external/SPIRV-Tools | 2 +- .../vk.binding.global-struct-of-resource.and.array.hlsl | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/external/SPIRV-Tools b/external/SPIRV-Tools index f289d047f4..ada1771a9f 160000 --- a/external/SPIRV-Tools +++ b/external/SPIRV-Tools @@ -1 +1 @@ -Subproject commit f289d047f49fb60488301ec62bafab85573668cc +Subproject commit ada1771a9f7a125573aa94fe551fdc44b45769bd diff --git a/tools/clang/test/CodeGenSPIRV/vk.binding.global-struct-of-resource.and.array.hlsl b/tools/clang/test/CodeGenSPIRV/vk.binding.global-struct-of-resource.and.array.hlsl index 9d226eb962..526bfc002c 100644 --- a/tools/clang/test/CodeGenSPIRV/vk.binding.global-struct-of-resource.and.array.hlsl +++ b/tools/clang/test/CodeGenSPIRV/vk.binding.global-struct-of-resource.and.array.hlsl @@ -27,6 +27,7 @@ float4 main() : SV_Target // CHECK: [[x:%[0-9]+]] = OpSampledImage %type_sampled_image [[tex]] [[smp]] return Textures[0].Sample(TheStruct.Sampler, float2(0, 0)) // CHECK: [[tex:%[0-9]+]] = OpLoad %type_2d_image %TheStruct_Texture +// CHECK: [[smp:%[0-9]+]] = OpLoad %type_sampler %TheStruct_Sampler // CHECK: [[x:%[0-9]+]] = OpSampledImage %type_sampled_image [[tex]] [[smp]] + TheStruct.Texture.Sample(TheStruct.Sampler, float2(0, 0)); }