From 0fcd1bffb5cdcf01713b385f5c88a319161e0bd3 Mon Sep 17 00:00:00 2001
From: spencer-lunarg <spencer@lunarg.com>
Date: Tue, 16 Sep 2025 21:13:29 -0400
Subject: [PATCH] Update Slang based tests

---
 common/output_stream.cpp                      |   3 ++
 spirv_reflect.h                               |   1 +
 tests/push_constants/pointer_in_struct.spv    | Bin 1008 -> 984 bytes
 .../push_constants/pointer_in_struct.spv.yaml |   6 ++--
 tests/push_constants/pointer_in_struct_2.spv  | Bin 1260 -> 1236 bytes
 .../pointer_in_struct_2.spv.yaml              |   6 ++--
 .../push_constants/push_constant_basic_2.spv  | Bin 1692 -> 1708 bytes
 .../push_constant_basic_2.spv.yaml            |  28 +++++++--------
 .../push_constants/push_constant_basic_3.spv  | Bin 1852 -> 1868 bytes
 .../push_constant_basic_3.spv.yaml            |   4 +--
 tests/variable_access/copy_array_1.spv        | Bin 944 -> 1164 bytes
 tests/variable_access/copy_array_1.spv.yaml   |   4 +--
 tests/variable_access/copy_array_3.spv        | Bin 1392 -> 1676 bytes
 tests/variable_access/copy_array_3.spv.yaml   |  34 +++++++++---------
 .../phy_storage_buffer_used_2.spv             | Bin 1020 -> 1020 bytes
 .../phy_storage_buffer_used_2.spv.yaml        |   2 +-
 .../phy_storage_buffer_used_3.spv             | Bin 1040 -> 1040 bytes
 .../phy_storage_buffer_used_3.spv.yaml        |   2 +-
 18 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/common/output_stream.cpp b/common/output_stream.cpp
index 4cd8078..4f2a86c 100644
--- a/common/output_stream.cpp
+++ b/common/output_stream.cpp
@@ -83,6 +83,9 @@ std::string ToStringGenerator(SpvReflectGenerator generator) {
     case SPV_REFLECT_GENERATOR_CLAY_CLAY_SHADER_COMPILER:
       return "Clay Clay Shader Compiler";
       break;
+    case SPV_REFLECT_GENERATOR_SLANG_SHADER_COMPILER:
+      return "Slang Shader Compiler";
+      break;
   }
   // unhandled SpvReflectGenerator enum value
   return "???";
diff --git a/spirv_reflect.h b/spirv_reflect.h
index eea30bd..2c0c73d 100644
--- a/spirv_reflect.h
+++ b/spirv_reflect.h
@@ -325,6 +325,7 @@ typedef enum SpvReflectGenerator {
   SPV_REFLECT_GENERATOR_KHRONOS_SPIRV_TOOLS_LINKER            = 17,
   SPV_REFLECT_GENERATOR_WINE_VKD3D_SHADER_COMPILER            = 18,
   SPV_REFLECT_GENERATOR_CLAY_CLAY_SHADER_COMPILER             = 19,
+  SPV_REFLECT_GENERATOR_SLANG_SHADER_COMPILER                 = 40,
 } SpvReflectGenerator;
 
 enum {
diff --git a/tests/push_constants/pointer_in_struct.spv b/tests/push_constants/pointer_in_struct.spv
index 7f3ce7b15229806cc5b7b3fd98d80be0bd8f4d7b..39d94e8d9dd91da02be5288d4db5b1071c00eaad 100755
GIT binary patch
delta 65
zcmeyseuG_znMs+Qft8VgfkA^o4oEUEOq6n%Shb4D#CWnAV;DC(P=pPLSr`~LmowgF
QWOSMw%Ips$moj?;0AOzm=l}o!

delta 88
zcmcb?{()VJnMs+Qft8U#gMooT4v0ZOkb#LIN^qi(gER+2a6nkRw?|NXSz=LUVp2|O
nd_jI@UP)?E@kHPCOok>C|AlQ%VZ6b}=s4My*&j&uGJ6968^0EV

diff --git a/tests/push_constants/pointer_in_struct.spv.yaml b/tests/push_constants/pointer_in_struct.spv.yaml
index 860e2be..d2820b1 100644
--- a/tests/push_constants/pointer_in_struct.spv.yaml
+++ b/tests/push_constants/pointer_in_struct.spv.yaml
@@ -90,7 +90,7 @@ all_type_descriptions:
   - &td5
     id: 13
     op: 30
-    type_name: "Data_std140"
+    type_name: "Data_std430"
     struct_member_name: 
     storage_class: -1 # NOT APPLICABLE
     type_flags: 0x10080000 # STRUCT EXTERNAL_BLOCK 
@@ -225,10 +225,10 @@ all_descriptor_bindings:
     uav_counter_id: 4294967295
     uav_counter_binding:
     type_description: *td1
-    word_offset: { binding: 109, set: 113 }
+    word_offset: { binding: 103, set: 107 }
 all_interface_variables:
 module:
-  generator: 0 # ???
+  generator: 40 # Slang Shader Compiler
   entry_point_name: "main"
   entry_point_id: 2
   source_language: 11 # Slang
diff --git a/tests/push_constants/pointer_in_struct_2.spv b/tests/push_constants/pointer_in_struct_2.spv
index 534265345d1407091cd27d055316a87f29f3d1f6..ba1348a54f4db8b48be3253b0835fe92fa06e507 100755
GIT binary patch
delta 69
zcmaFEd4*GmnMs+Qft8VgfkA^o1xPY5Oq6n%Shb4D#CWnAV;?6wP=pPLSvId_OlD$q
Snk>j-4kSHU!hz&M7H<HW`V9F1

delta 94
zcmcb@`G!-9nMs+Qft8U#gMooT1&BdFkb#LIN^qi(gER+2a6nkRw?|NXSz=LUVp2|O
rd_jI@UP)?E@kHPCOok>C|MhL2!x+QF=s5W&vpJA7WC;h7oh;q}unQP`

diff --git a/tests/push_constants/pointer_in_struct_2.spv.yaml b/tests/push_constants/pointer_in_struct_2.spv.yaml
index 487cf11..27126e2 100644
--- a/tests/push_constants/pointer_in_struct_2.spv.yaml
+++ b/tests/push_constants/pointer_in_struct_2.spv.yaml
@@ -126,7 +126,7 @@ all_type_descriptions:
   - &td7
     id: 13
     op: 30
-    type_name: "Data_std140"
+    type_name: "Data_std430"
     struct_member_name: 
     storage_class: -1 # NOT APPLICABLE
     type_flags: 0x10080000 # STRUCT EXTERNAL_BLOCK 
@@ -329,10 +329,10 @@ all_descriptor_bindings:
     uav_counter_id: 4294967295
     uav_counter_binding:
     type_description: *td1
-    word_offset: { binding: 123, set: 127 }
+    word_offset: { binding: 117, set: 121 }
 all_interface_variables:
 module:
-  generator: 0 # ???
+  generator: 40 # Slang Shader Compiler
   entry_point_name: "main"
   entry_point_id: 2
   source_language: 11 # Slang
diff --git a/tests/push_constants/push_constant_basic_2.spv b/tests/push_constants/push_constant_basic_2.spv
index d06fa70766a178e02d0cbe480df95a4fcc51ef3c..523593a3781f9af0724bfbc24ad11c381ee64af2 100755
GIT binary patch
literal 1708
zcmZ9LTTc^F6opTjUZg03h_^s(MI(qBl!_!olU5T*h>3wjADd}AXp_=5)9C|m{#W%s
z_+sMvX3nln580f(*S@ba4HmXau8?!iZM!4==d8K~_w#mk<0-o(cmDZH>-6NTHBN?c
z_$_L+Cl?n{JT*K0a6Bfr>=vi7qwiPaUMK8Nqp~Eo>;m^o^{IW+slDz6$z|9Z=yEqC
z>yi~$Oz~Ce#F_-kU-EWA`DN*6U(b_x(n%(9)NQ7-In~Xlwc=<z=_lAF^>eP(h~w}|
zQ+4b6d#y=tkkr+wkox3y-7pEc3;MgIyBV@5!A^1c6vMBQQ=8c!fShIBA63JW$N}R}
z*lcpzGd3Kw!#JIV_&_okb|YP?8l;?zI#~~5JHyM-B#Ayj+p&6F6IPVuCD?HE-wslq
z$U9LrIOA+(R~irRwK@CIjJ+b=>QMtOIaUJ<zBuz3yMozlYtpUOv36r$o6WeItpPS$
zgI<<HoIa;?FR(xYR+X%&DtR@b;OOg`f^V+s?Oks(4+noqcNIgYDjROEOTaf(32xCV
z(%}-DIARbmtIPMx-W&Q4hvb2g3x{A8`QQ#8LM=G@t;MoF#dKeEa)`xG9J?<{*d6<h
zw~4hGHl^phzvBJWA-?Ku=CJr}>AVO29q*^7`CmzgPyDaFpLvdCvp?SwH#YO}duGN1
zF`v^-Z4Nd5$bz4Sz6f|Gj(pw&X)1@E?n<Zw_D&h>cTWOt_I>H(|4<J82NE#i-m4ov
zFzdA;eZCj`Je1H2-soS|U6X**zu{-%_W@3v&A_(@ZuVp8^s$+qNCzX1nec(xOi!iH
z&$J`#nS_~m8{=fx<Foyr3j??QFQik``oEM8MjZX|fm#1O>GS=0<9!MJd3$Q}-gOE1
q2l0XZ#$#DbF@1vrkMrhviOuy^I=yVJL+N0|GZ#LvzxrYhCI0~W?rMSn

literal 1692
zcmZ9M+fNfw5XMjGO+dMbc!jzJ?|7#Y6QfDd1QKInAkoKW+b-Iq&}O^)z?=W8`ak$$
z;`iG<Q#U=yFf-rGd^2axmh#+o-PKCYxw_laU(TwVb3d=-n#h7%bjP2+bUq#)btcIu
z4!=d6ZhCSO#Z$L83?~z67u@_bcl`Z)GU$cFX;xn3mR#BW5<lF_>RXk@J`D$FQtIxM
z;oOR=W%#OW;wEK97rkFqeMR=s*W)Bkdr2Bc{rzk<C*DfN6-SeFnBeEVI_)?P&ox!Q
zwfnr24$hL6I#shdMCJNn5~4wB()%G7CE3ZZWEgQ#PJL!$0o2r`KZwJMr~%_ZY(6#J
zg3rCXVXS!0!4A$w{YXj(w{~va%X?7U8=a2RB>KeK4%Fj<Fy>_+2g*jnd8le^&UUV{
zd}7TRf2-in%QikZcqfi=fDz}+V$27Y&r;EM@t=#?*oVz#yD4&j6*=f-HRS2@$?gSK
zmVgD4HL>z-G=*N2#$MMHm!ty;oIBoMlFcE$EFIwJ1oBs;sR!Q_7rVu7$mUM?<ne8i
z2WGsNy}u!p9a0BIEjt8jD8}xHA#kyy-?~`dr<UCpn;LS7leZ=f2Y1J37uLsSSQl3E
z@vA-#5Bb-;PmSeYm(6<+zv1KbwD?Wg?3ws2A7`F7^4S5k>;a$o$c2AT)7x)VZkF>$
z*&DLkx)poglu*xmAZ^ufr-lR`u(#r67q=zg<_EH=|DhV<O-Udj@13fNfmyFD*|WXa
z58n^H*c<)X(H#kRai+T-C(mZMCmY=S`?Bd{Gd++EMjkT}1GAYP%ATExH+UprCf>$&
zvg7e$|Hs0>t^X6*a9aPTvcbrsKQS=t|4jC5f8JRC?y~;8J>0za3y;6oj__Z4EYGQB
gZ?NleI4csHt0kLWHrFfJVB|9wF|fa`<X%hu0V9TJ<NyEw

diff --git a/tests/push_constants/push_constant_basic_2.spv.yaml b/tests/push_constants/push_constant_basic_2.spv.yaml
index fc4a816..baebaef 100644
--- a/tests/push_constants/push_constant_basic_2.spv.yaml
+++ b/tests/push_constants/push_constant_basic_2.spv.yaml
@@ -2,7 +2,7 @@
 ---
 all_type_descriptions:
   - &td0
-    id: 8
+    id: 11
     op: 29
     type_name: 
     struct_member_name: 
@@ -19,7 +19,7 @@ all_type_descriptions:
     member_count: 0
     members:
   - &td1
-    id: 4
+    id: 10
     op: 30
     type_name: "RWStructuredBuffer"
     struct_member_name: 
@@ -37,7 +37,7 @@ all_type_descriptions:
     members:
       - *td0
   - &td2
-    id: 15
+    id: 7
     op: 21
     type_name: 
     struct_member_name: "a"
@@ -54,7 +54,7 @@ all_type_descriptions:
     member_count: 0
     members:
   - &td3
-    id: 9
+    id: 16
     op: 28
     type_name: 
     struct_member_name: "data"
@@ -71,7 +71,7 @@ all_type_descriptions:
     member_count: 0
     members:
   - &td4
-    id: 5
+    id: 15
     op: 30
     type_name: "_Array_std430_uint4"
     struct_member_name: "b"
@@ -89,7 +89,7 @@ all_type_descriptions:
     members:
       - *td3
   - &td5
-    id: 15
+    id: 7
     op: 21
     type_name: 
     struct_member_name: "t"
@@ -106,7 +106,7 @@ all_type_descriptions:
     member_count: 0
     members:
   - &td6
-    id: 15
+    id: 7
     op: 21
     type_name: 
     struct_member_name: "s"
@@ -123,7 +123,7 @@ all_type_descriptions:
     member_count: 0
     members:
   - &td7
-    id: 6
+    id: 18
     op: 30
     type_name: "Bar_std430"
     struct_member_name: "bar"
@@ -142,7 +142,7 @@ all_type_descriptions:
       - *td5
       - *td6
   - &td8
-    id: 10
+    id: 19
     op: 32
     type_name: 
     struct_member_name: "node"
@@ -159,7 +159,7 @@ all_type_descriptions:
     member_count: 0
     members:
   - &td9
-    id: 7
+    id: 14
     op: 30
     type_name: "Data_std430"
     struct_member_name: 
@@ -350,7 +350,7 @@ all_block_variables:
     type_description: *td9
 all_descriptor_bindings:
   - &db0
-    spirv_id: 2
+    spirv_id: 13
     name: "result"
     binding: 0
     input_attachment_index: 0
@@ -365,12 +365,12 @@ all_descriptor_bindings:
     uav_counter_id: 4294967295
     uav_counter_binding:
     type_description: *td1
-    word_offset: { binding: 129, set: 133 }
+    word_offset: { binding: 133, set: 137 }
 all_interface_variables:
 module:
-  generator: 7 # Khronos SPIR-V Tools Assembler
+  generator: 40 # Slang Shader Compiler
   entry_point_name: "main"
-  entry_point_id: 1
+  entry_point_id: 2
   source_language: 11 # Slang
   source_language_version: 1
   spirv_execution_model: 5 # GLCompute
diff --git a/tests/push_constants/push_constant_basic_3.spv b/tests/push_constants/push_constant_basic_3.spv
index 92a6e257303afe53e6f0e80a303ddb77bb09debf..2ba47159222b9f865387f64cda0cf602ca09b874 100644
GIT binary patch
delta 65
zcmdnPcZQFfnMs+Qft8Vgfk9&<w;>ZJ2av@E#4MXlnd+GtohEN(%?6T+Y{Ed&l&u~l
M!ln!)Z?Yu=09<+u>Hq)$

delta 55
zcmX@Zw}+3LnMs+Qft8U#gMncqw;|JJAEpXsM#srVS+jwpA)7FebY-gtiLfaH$(L-&
E06``VDgXcg

diff --git a/tests/push_constants/push_constant_basic_3.spv.yaml b/tests/push_constants/push_constant_basic_3.spv.yaml
index 2a54cb4..04c1060 100644
--- a/tests/push_constants/push_constant_basic_3.spv.yaml
+++ b/tests/push_constants/push_constant_basic_3.spv.yaml
@@ -608,10 +608,10 @@ all_descriptor_bindings:
     uav_counter_id: 4294967295
     uav_counter_binding:
     type_description: *td1
-    word_offset: { binding: 157, set: 161 }
+    word_offset: { binding: 161, set: 165 }
 all_interface_variables:
 module:
-  generator: 0 # ???
+  generator: 40 # Slang Shader Compiler
   entry_point_name: "main"
   entry_point_id: 2
   source_language: 11 # Slang
diff --git a/tests/variable_access/copy_array_1.spv b/tests/variable_access/copy_array_1.spv
index 94de63f7acc57af1cf1c925ca8b70ca6cc249a89..5923fb4ac5e2abce9d628a1c3767a1bc21e3633a 100644
GIT binary patch
delta 396
zcmZ9GOA5k35JY=SVib)C{zWmOLO=xFxe^q_19+fZz+G0}LXYLj6A0FW35biwbXD~<
z^@wlvB&aN6i=3HdmOYcg)f3HCu`TZIy17_rUGKE@qWgb(=yh1U+&fSGMpJG>pxHpz
z#9EqnEW#f>)f{=vn~I9p?9T<g_)oqRf!E|K5t|i*;GCbdLF=AqiH^Xd`9R=v>nM+I
uBY}^1&{Z`3%6y`koIB)b`j+`jGkGeM?+k;&<-$TU3zX&nn!+D*wijQ!ZxqM?

delta 177
zcmeC-+`!Ju%%sfDz{<#=!N9=awvl%-<KzvDK9hBr-dJigurP1{MOA>91&CpMRUn%c
ziLVA^vmx=-Cr@Pd4sisk5dn&d0x=&D3j=Wg13LpZkah)Pkf|V(K)Tg|H~?q|7mzjw
UVvxKY12b4Ji2s*?k--9p0T}!acK`qY

diff --git a/tests/variable_access/copy_array_1.spv.yaml b/tests/variable_access/copy_array_1.spv.yaml
index f8a820f..be7a4d1 100644
--- a/tests/variable_access/copy_array_1.spv.yaml
+++ b/tests/variable_access/copy_array_1.spv.yaml
@@ -227,10 +227,10 @@ all_descriptor_bindings:
     uav_counter_id: 4294967295
     uav_counter_binding:
     type_description: *td5
-    word_offset: { binding: 118, set: 122 }
+    word_offset: { binding: 122, set: 126 }
 all_interface_variables:
 module:
-  generator: 0 # ???
+  generator: 40 # Slang Shader Compiler
   entry_point_name: "main"
   entry_point_id: 2
   source_language: 11 # Slang
diff --git a/tests/variable_access/copy_array_3.spv b/tests/variable_access/copy_array_3.spv
index ccec67a5c6ff725fc194fcded1f67a3fb47435c2..c1db7ffb88d3a6a18a59425ea47ede7b694b00cb 100755
GIT binary patch
literal 1676
zcmZ{j+fNfw5XKMP76g=nfOvtj<z}VEKt*F>G-+QX@x?%*kDKj{kN{1#+Xw%1Ur79Z
zr)P9+;vvJ#H}lQq%-Kez{RLN<bIvu~JN@UZxst=P<d)s#x9`c<^NVDhkFxY?kaQ=*
z;UN11dpGHLOwNjnP(H8fR8n?Ha+_Y?;eRaImaMvY?_ZNm50gmw%K=xEza%?pXIc7F
zz4~WwPm;;?U4EwQijOJm`e~k`EBafI?xfjiV2fAwKH`uJ)2~~=%-EAqp(=gx<1)`C
zy?l}l`W=5)Vr4)7a5Op<#rJz6t$wXyKYX0NgnnT94GNfkLkaz!N&l}OyHdZFl<!~M
z<rmdvSM!px<XjB)#o3=K?_(#NSsyduTa}OtkNWsx3H2XIQ~xAjxPNivcSR2Q?2Ti6
z$mhN5-aD-a-Yeh@+0?TcY<E_Jy0*XKtoUYU-3qmA*607=$nV)^W#=60!>sJOI4hW0
z*%R@aw9N{R17`Q@ng(87-)|(1y(tdge;jZ#U}|uPKah?AI$Oev()g%p{D%Q=%gcKc
z$5&G)-Wy*nydU}argf+92bZ_q5uZI{lgoR7W7Xw%2oIn2U6;*0i1SXwsZB5TKiiA_
z!y!g5_K!_3_6?@i3u$=x!0Z*wJ-~6m+`(o!lFi#0ekGede-xkD`L3t|rao^6ey>^Q
zq{-!w^Gk^Rw)L8P-zyUGc^9Ok9PYa*A;uoya=)h%YR__aLJThX+-X;WA8uQ|Sh_C3
zkMEPF;EsG__>IFi35Qz7IgpLtIES*~97&AxQZ|0$G-ShJSH?M(jo)T$%I2QM8D9(I
t$M;zq12d!5eIuJV^AQI#pT+t85ob2yU}m#;OEz)lA`WJ*d%e^L$!`r~Tz3Ef

literal 1392
zcmZ{j-D?^_6vao^kJ7Y>X=0MLYS-qa(3d2YPzVWX3l;ieBeajp>S_>Lg>`-Cf8Liu
z&u^S5%R)vDckY>c@40hl4a(<rQ!SZy#+bFhIy7Zdl6`9S%w+sM`Z~IgHrYCjALh|?
zyI9QA|L*K(yxEYmZvu?XJ1{D#eOdSwFIVtQ;f>HRHOn7rkA_E}{5|JamA|ijG)U9<
zx3rSphl^;tTxC6FSM8aOO%i7@wyNJV*<qYsx@g5!EXO%P-bZhm^XYLWp!q`f{>LOs
zx3g@U&Xb|ND`yqk|6;wqREX7kDJ#9JydE4Y5zxa&Z=UnfTL|d2WFOOGR?@qYvHJO0
zeo^fM@in0$j1<AVSm!%qIcCBta`Xh(5XdEt`f#B@{UcfGUsyk|vmu6f=EU-KiRXR0
zmfhv!zjZ!2el|YGbH!eWEB4YBm+ytS`Cizwd|i5BcKKfL=>@GLWn#Pf-U7!pl|%hd
zVByzgLxI@$&VQmk^Y%X9E9+G3b6Ni$E&2X^$mvLl_kruUc@qz})2-OI;2l6)@ywq+
zxy&0sRNZ68!}&f=w5LzbPu)4S(PExOtyeCFGqjj5d$gD*KD9cs^Z<9`w0T!Je9oCI
z{<XB|fp=js+duM{*Fd-ATjM`ZK63*D<<Re$z!~=-mi}G~)Go$`?u^)5Rp*{vAr!u;
z9y9I>a4a}xJP`T<%X35R`$8$leR5nm$9;AjcN*)<Kw~9PlN#g@Gj{z<wCDUzQ{Zm+
Jf2HzK_y@EBRqp@*

diff --git a/tests/variable_access/copy_array_3.spv.yaml b/tests/variable_access/copy_array_3.spv.yaml
index 941b89e..21db8f3 100644
--- a/tests/variable_access/copy_array_3.spv.yaml
+++ b/tests/variable_access/copy_array_3.spv.yaml
@@ -2,7 +2,7 @@
 ---
 all_type_descriptions:
   - &td0
-    id: 13
+    id: 9
     op: 23
     type_name: 
     struct_member_name: "a"
@@ -19,7 +19,7 @@ all_type_descriptions:
     member_count: 0
     members:
   - &td1
-    id: 15
+    id: 11
     op: 28
     type_name: 
     struct_member_name: "data"
@@ -36,7 +36,7 @@ all_type_descriptions:
     member_count: 0
     members:
   - &td2
-    id: 14
+    id: 10
     op: 30
     type_name: "_Array_std430_uint4"
     struct_member_name: "b"
@@ -54,7 +54,7 @@ all_type_descriptions:
     members:
       - *td1
   - &td3
-    id: 6
+    id: 8
     op: 21
     type_name: 
     struct_member_name: "c"
@@ -71,7 +71,7 @@ all_type_descriptions:
     member_count: 0
     members:
   - &td4
-    id: 19
+    id: 16
     op: 29
     type_name: "Bar1_std430"
     struct_member_name: 
@@ -91,7 +91,7 @@ all_type_descriptions:
       - *td2
       - *td3
   - &td5
-    id: 18
+    id: 15
     op: 30
     type_name: "RWStructuredBuffer"
     struct_member_name: 
@@ -109,7 +109,7 @@ all_type_descriptions:
     members:
       - *td4
   - &td6
-    id: 13
+    id: 9
     op: 23
     type_name: 
     struct_member_name: "d"
@@ -126,7 +126,7 @@ all_type_descriptions:
     member_count: 0
     members:
   - &td7
-    id: 15
+    id: 11
     op: 28
     type_name: 
     struct_member_name: "data"
@@ -143,7 +143,7 @@ all_type_descriptions:
     member_count: 0
     members:
   - &td8
-    id: 14
+    id: 10
     op: 30
     type_name: "_Array_std430_uint4"
     struct_member_name: "e"
@@ -161,7 +161,7 @@ all_type_descriptions:
     members:
       - *td7
   - &td9
-    id: 6
+    id: 8
     op: 21
     type_name: 
     struct_member_name: "f"
@@ -178,7 +178,7 @@ all_type_descriptions:
     member_count: 0
     members:
   - &td10
-    id: 29
+    id: 26
     op: 29
     type_name: "Bar2_std430"
     struct_member_name: 
@@ -198,7 +198,7 @@ all_type_descriptions:
       - *td8
       - *td9
   - &td11
-    id: 28
+    id: 25
     op: 30
     type_name: "RWStructuredBuffer"
     struct_member_name: 
@@ -420,7 +420,7 @@ all_block_variables:
     type_description: *td11
 all_descriptor_bindings:
   - &db0
-    spirv_id: 21
+    spirv_id: 18
     name: "foo1"
     binding: 0
     input_attachment_index: 0
@@ -435,9 +435,9 @@ all_descriptor_bindings:
     uav_counter_id: 4294967295
     uav_counter_binding:
     type_description: *td5
-    word_offset: { binding: 148, set: 152 }
+    word_offset: { binding: 152, set: 156 }
   - &db1
-    spirv_id: 31
+    spirv_id: 28
     name: "foo2"
     binding: 0
     input_attachment_index: 0
@@ -452,10 +452,10 @@ all_descriptor_bindings:
     uav_counter_id: 4294967295
     uav_counter_binding:
     type_description: *td11
-    word_offset: { binding: 183, set: 187 }
+    word_offset: { binding: 195, set: 199 }
 all_interface_variables:
 module:
-  generator: 0 # ???
+  generator: 40 # Slang Shader Compiler
   entry_point_name: "main"
   entry_point_id: 2
   source_language: 11 # Slang
diff --git a/tests/variable_access/phy_storage_buffer_used_2.spv b/tests/variable_access/phy_storage_buffer_used_2.spv
index 10a3c832fb831e3b685e7ba0bda8222114eeeaf7..ed77b0af2197d95064e5f70338fb5ee41e6812ef 100644
GIT binary patch
delta 38
rcmeyv{)e5LnMs+Qft8Vgfk9&<cOWyP)8trYZy>pnSs6&4W!47(ne7OA

delta 38
rcmeyv{)e5LnMs+Qft8U#gMncqcOWyP<K$RoZy>pnSs6&4W!47(nj8ps

diff --git a/tests/variable_access/phy_storage_buffer_used_2.spv.yaml b/tests/variable_access/phy_storage_buffer_used_2.spv.yaml
index ced11a1..d3e5bef 100644
--- a/tests/variable_access/phy_storage_buffer_used_2.spv.yaml
+++ b/tests/variable_access/phy_storage_buffer_used_2.spv.yaml
@@ -264,7 +264,7 @@ all_descriptor_bindings:
     word_offset: { binding: 120, set: 124 }
 all_interface_variables:
 module:
-  generator: 0 # ???
+  generator: 40 # Slang Shader Compiler
   entry_point_name: "main"
   entry_point_id: 2
   source_language: 11 # Slang
diff --git a/tests/variable_access/phy_storage_buffer_used_3.spv b/tests/variable_access/phy_storage_buffer_used_3.spv
index 84dfcd291523ff709ac943c4ad87bbe7517c862f..9f18d7860b8400362db5e2665ec9fce9c52fab34 100644
GIT binary patch
delta 52
zcmbQhF@b}dnMs+Qft8Vgfk9&<_grR1r^zdsl|`KxSQ!L?VnRU72gLk9>@@iyvpxX9
CI0qg8

delta 52
zcmbQhF@b}dnMs+Qft8U#gMncq_grR1$H^<1l|>yHSQ!Kv7#M_rm=B2gf!J~KLuP#d
D!Al1l

diff --git a/tests/variable_access/phy_storage_buffer_used_3.spv.yaml b/tests/variable_access/phy_storage_buffer_used_3.spv.yaml
index 7d28480..2d0e5e2 100644
--- a/tests/variable_access/phy_storage_buffer_used_3.spv.yaml
+++ b/tests/variable_access/phy_storage_buffer_used_3.spv.yaml
@@ -353,7 +353,7 @@ all_descriptor_bindings:
     word_offset: { binding: 128, set: 132 }
 all_interface_variables:
 module:
-  generator: 0 # ???
+  generator: 40 # Slang Shader Compiler
   entry_point_name: "main"
   entry_point_id: 2
   source_language: 11 # Slang