Skip to content

Commit b7b532b

Browse files
[SPIR-V] Update submodules (microsoft#7269)
spirv-val has added a validation that enforces a minimum version of SPIR-V 1.3 when using VulkanMemoryModel, so I've updated the tests that use it to use the correct target environment. Needed for microsoft#7266.
1 parent 0fa207a commit b7b532b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

tools/clang/test/CodeGenSPIRV/decoration.coherent.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %dxc -T ps_6_0 -E main -fcgl %s -spirv | FileCheck %s -check-prefix=GLSL450
2-
// RUN: %dxc -T ps_6_0 -E main -fcgl -fspv-use-vulkan-memory-model %s -spirv | FileCheck %s -check-prefix=VULKAN
2+
// RUN: %dxc -T ps_6_0 -E main -fcgl -fspv-use-vulkan-memory-model -fspv-target-env=vulkan1.1 %s -spirv | FileCheck %s -check-prefix=VULKAN
33

44
// When the GLSL450 memory model is used, there should be no memory operands on the loads and stores.
55
// When the Vulkan memory model is used, there should be no decorations. There should be memory operands on the loads and stores instead.

tools/clang/test/CodeGenSPIRV/intrinsics.interlocked-methods.ps.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %dxc -T ps_6_0 -E main -fcgl %s -spirv | FileCheck %s -check-prefix=CHECK -check-prefix=GLSL450
2-
// RUN: %dxc -T ps_6_0 -E main -fcgl -fspv-use-vulkan-memory-model %s -spirv | FileCheck %s -check-prefix=CHECK -check-prefix=VULKAN
2+
// RUN: %dxc -T ps_6_0 -E main -fcgl -fspv-use-vulkan-memory-model -fspv-target-env=vulkan1.1 %s -spirv | FileCheck %s -check-prefix=CHECK -check-prefix=VULKAN
33

44
RWTexture1D <int> g_tTex1di1;
55
RWTexture1D <uint> g_tTex1du1;

0 commit comments

Comments
 (0)