From 4485cf3eaf142cfd5f8470e86739acc67d4e12ea Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Thu, 6 Mar 2025 14:26:34 -0800
Subject: Update SPIRV-Tools and fix new validation errors. (#6511)

* Update SPIRV-Tools and fix new validation errors.

* Implement pointers for glsl target.

* Reworked packStorage/unpackStorage code gen to operate on pointers rather than values.
---
 tests/spirv/aligned-load-store.slang           | 12 ++++++++++++
 tests/spirv/buffer-pointer-matrix-layout.slang |  3 +--
 tests/spirv/sb-load-2.slang                    |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'tests/spirv')

diff --git a/tests/spirv/aligned-load-store.slang b/tests/spirv/aligned-load-store.slang
index c6b958dc2..e8bee779e 100644
--- a/tests/spirv/aligned-load-store.slang
+++ b/tests/spirv/aligned-load-store.slang
@@ -3,11 +3,23 @@
 // CHECK: OpLoad {{.*}} Aligned 8
 // CHECK: OpStore {{.*}} Aligned 16
 
+// CHECK: OpLoad {{.*}} Aligned 8
+// CHECK: OpLoad {{.*}} Aligned 8
+// CHECK: OpStore {{.*}} Aligned 16
+// CHECK: OpStore {{.*}} Aligned 16
+
 uniform float4* data;
 
+struct C { float4 v0; float4 v1; }
+uniform C* data2;
+
+
 [numthreads(1,1,1)]
 void computeMain()
 {
     var v = loadAligned<8>((float2x4*)data);
     storeAligned<16>((float2x4*)data+1, v);
+
+    var v1 = loadAligned<8>(data2);
+    storeAligned<16>(data2, v1);
 }
\ No newline at end of file
diff --git a/tests/spirv/buffer-pointer-matrix-layout.slang b/tests/spirv/buffer-pointer-matrix-layout.slang
index 2ccde7b71..cbb8f2857 100644
--- a/tests/spirv/buffer-pointer-matrix-layout.slang
+++ b/tests/spirv/buffer-pointer-matrix-layout.slang
@@ -1,7 +1,6 @@
 //TEST:SIMPLE(filecheck=CHECK): -target spirv -emit-spirv-directly -stage compute -entry main -matrix-layout-column-major
 
-// CHECK: OpLoad %_MatrixStorage_float3x4_ColMajornatural {{.*}} Aligned 4
-// CHECK: OpLoad %_MatrixStorage_float3x4_ColMajornatural {{.*}} Aligned 4
+// CHECK: OpLoad {{.*}} Aligned 4
 
 struct Push
 {
diff --git a/tests/spirv/sb-load-2.slang b/tests/spirv/sb-load-2.slang
index b4c10cb4a..05f3766d8 100644
--- a/tests/spirv/sb-load-2.slang
+++ b/tests/spirv/sb-load-2.slang
@@ -11,8 +11,8 @@ struct Test1
 StructuredBuffer<Test1> dp;
 RWStructuredBuffer<float4> outputBuffer;
 
-// CHECK-COUNT-2: unpackStorage
-// CHECK-NOT: unpackStorage
+// CHECK: outputBuffer{{.*}}._data[{{.*}}] =
+
 [numthreads(4, 4, 1)]
 void main(uint3 GTid : SV_GroupThreadID, 
           uint GI    : SV_GroupIndex)
-- 
cgit v1.2.3