From 7f1caf4aa9a44fe71bac8304018dabb4393e1407 Mon Sep 17 00:00:00 2001 From: saurabhnv <156190705+saurabhnv@users.noreply.github.com> Date: Tue, 2 Apr 2024 22:46:45 +0530 Subject: [PATCH] Shader -> SPIR-V at CTS build time (#1849) (#1878) * Shader -> SPIR-V at CTS build time (#1849) Instead of relying on prebuilt checked-in SPIR-V files, compile available shaders at CTS build time. * Add dependency on glslc (available as part of VULKAN_SDK). * Add optional build flag BUILD_GLSL_SHADERS, OFF by default. * Remove pre-built SPIR-V files * Compile Shader -> SPIR-V at CTS build time * Use glslangValidator for shader -> spirv * Add glslangValidator tool for shader -> spirv * Refactor glslangValidator tool retrieval * Address review comments * Use add_subdirectory() instead of include() * Use glslang instead of glslangValidator * Update Github actions CI to install Vulkan SDK --- .github/workflows/presubmit.yml | 5 ++ test_conformance/vulkan/CMakeLists.txt | 2 + .../vulkan/shaders/CMakeLists.txt | 45 ++++++++++++++++++ test_conformance/vulkan/shaders/buffer.spv | Bin 2096 -> 0 bytes test_conformance/vulkan/shaders/image2D.comp | 6 +-- .../vulkan/shaders/image2D_r16i.spv | Bin 3264 -> 0 bytes .../vulkan/shaders/image2D_r16ui.spv | Bin 3264 -> 0 bytes .../vulkan/shaders/image2D_r32f.spv | Bin 3268 -> 0 bytes .../vulkan/shaders/image2D_r32i.spv | Bin 3256 -> 0 bytes .../vulkan/shaders/image2D_r32ui.spv | Bin 3256 -> 0 bytes .../vulkan/shaders/image2D_r8i.spv | Bin 3264 -> 0 bytes .../vulkan/shaders/image2D_r8ui.spv | Bin 3264 -> 0 bytes .../vulkan/shaders/image2D_rg16i.spv | Bin 3264 -> 0 bytes .../vulkan/shaders/image2D_rg16ui.spv | Bin 3264 -> 0 bytes .../vulkan/shaders/image2D_rg32f.spv | Bin 3276 -> 0 bytes .../vulkan/shaders/image2D_rg32i.spv | Bin 3264 -> 0 bytes .../vulkan/shaders/image2D_rg32ui.spv | Bin 3264 -> 0 bytes .../vulkan/shaders/image2D_rg8i.spv | Bin 3264 -> 0 bytes .../vulkan/shaders/image2D_rg8ui.spv | Bin 3264 -> 0 bytes .../vulkan/shaders/image2D_rgba16i.spv | Bin 3256 -> 0 bytes .../vulkan/shaders/image2D_rgba16ui.spv | Bin 3256 -> 0 bytes .../vulkan/shaders/image2D_rgba32f.spv | Bin 3268 -> 0 bytes .../vulkan/shaders/image2D_rgba32i.spv | Bin 3256 -> 0 bytes .../vulkan/shaders/image2D_rgba32ui.spv | Bin 3256 -> 0 bytes .../vulkan/shaders/image2D_rgba8i.spv | Bin 3256 -> 0 bytes .../vulkan/shaders/image2D_rgba8ui.spv | Bin 3256 -> 0 bytes .../vulkan/shaders/image2D_test_formats.txt | 21 ++++++++ 27 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 test_conformance/vulkan/shaders/CMakeLists.txt delete mode 100644 test_conformance/vulkan/shaders/buffer.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_r16i.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_r16ui.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_r32f.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_r32i.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_r32ui.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_r8i.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_r8ui.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_rg16i.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_rg16ui.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_rg32f.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_rg32i.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_rg32ui.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_rg8i.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_rg8ui.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_rgba16i.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_rgba16ui.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_rgba32f.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_rgba32i.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_rgba32ui.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_rgba8i.spv delete mode 100644 test_conformance/vulkan/shaders/image2D_rgba8ui.spv create mode 100644 test_conformance/vulkan/shaders/image2D_test_formats.txt diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index e8fd8c45..0da329e1 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -50,6 +50,11 @@ jobs: cd OpenCL-Headers ln -s CL OpenCL # For OSX builds cd .. + - name: Install Vulkan SDK + uses: humbletim/install-vulkan-sdk@main + with: + version: 1.3.275.0 + cache: true - name: Build shell: bash run: ./presubmit.sh diff --git a/test_conformance/vulkan/CMakeLists.txt b/test_conformance/vulkan/CMakeLists.txt index 9778693b..9c9cc7d4 100644 --- a/test_conformance/vulkan/CMakeLists.txt +++ b/test_conformance/vulkan/CMakeLists.txt @@ -43,4 +43,6 @@ set_source_files_properties( PROPERTIES LANGUAGE CXX) include_directories("../common/vulkan_wrapper") +add_subdirectory(shaders) + include(../CMakeCommon.txt) diff --git a/test_conformance/vulkan/shaders/CMakeLists.txt b/test_conformance/vulkan/shaders/CMakeLists.txt new file mode 100644 index 00000000..881b3f20 --- /dev/null +++ b/test_conformance/vulkan/shaders/CMakeLists.txt @@ -0,0 +1,45 @@ +# CMP0007:NEW - Don't ignore empty elements in a list +cmake_policy(SET CMP0007 NEW) +find_program( + Vulkan_glslang_binary + NAMES glslang + HINTS $ENV{VULKAN_SDK}) + +if(${Vulkan_glslang_binary} STREQUAL "Vulkan_glslang_binary-NOTFOUND") + message(FATAL_ERROR "glslang tool (part of Vulkan SDK) is a prerequisite to compile shaders to spir-v") +else() + message(STATUS "Found glslang: ${Vulkan_glslang_binary}") + + set(IMAGE2D_SHADER_IN_FILE "image2D.comp") + set(IMAGE2D_SHADER_TMP_OUT_FILE "tmp_image2D.comp") + set(BUFFER_SHADER_IN_FILE "buffer") + set(IMAGE2D_FORMATS_LIST_IN_FILE "image2D_test_formats.txt") + + file(READ ${IMAGE2D_SHADER_IN_FILE} IMAGE2D_SHADER_UNFORMAT_CONTENT) + file(STRINGS ${IMAGE2D_FORMATS_LIST_IN_FILE} IMAGE2D_FORMATS_LIST) + + foreach(IMAGE2D_FORMAT ${IMAGE2D_FORMATS_LIST}) + list(GET IMAGE2D_FORMAT 1 GLSL_FORMAT) + list(GET IMAGE2D_FORMAT 2 GLSL_TYPE_PREFIX) + string(REPLACE "GLSL_FORMAT" "${GLSL_FORMAT}" IMAGE2D_SHADER_CONTENT "${IMAGE2D_SHADER_UNFORMAT_CONTENT}") + string(REPLACE "GLSL_TYPE_PREFIX" "${GLSL_TYPE_PREFIX}" IMAGE2D_SHADER_CONTENT "${IMAGE2D_SHADER_CONTENT}") + file(WRITE ${IMAGE2D_SHADER_TMP_OUT_FILE} "${IMAGE2D_SHADER_CONTENT}") + execute_process( + COMMAND ${Vulkan_glslang_binary} --target-env vulkan1.0 -o image2D_${GLSL_FORMAT}.spv ${IMAGE2D_SHADER_TMP_OUT_FILE} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + RESULT_VARIABLE commandStatus + OUTPUT_QUIET) + if(commandStatus AND NOT commandStatus EQUAL 0) + message(FATAL_ERROR "shader -> spir-v compilation failed") + endif() + endforeach(IMAGE2D_FORMAT) + execute_process( + COMMAND ${Vulkan_glslang_binary} --target-env vulkan1.0 -o ${BUFFER_SHADER_IN_FILE}.spv ${BUFFER_SHADER_IN_FILE}.comp + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + RESULT_VARIABLE commandStatus + OUTPUT_QUIET) + if(commandStatus AND NOT commandStatus EQUAL 0) + message(FATAL_ERROR "shader -> spir-v compilation failed") + endif() + file(REMOVE ${IMAGE2D_SHADER_TMP_OUT_FILE}) +endif() \ No newline at end of file diff --git a/test_conformance/vulkan/shaders/buffer.spv b/test_conformance/vulkan/shaders/buffer.spv deleted file mode 100644 index c9d15950c20301808fa6de3a34e23d21313d239d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2096 zcmb7^+fEZv6o$7@%1HzS!~+6 zqb4T)U%Pkgt-D!SYyIoI_MSF3jkg+e!E~B7lQZ?xYnp@@1D~+m?=_~ww3>sxx8BR` zeQ)tFOuRTLNB&7bRHsSTVsg6&yVG%UJUur*1AfUg!)mr}#kWXKiHd$$0v{GV6ZI$_ zTxHC;i26{oeof-vrKC)|$?baC{dF%6Dt_cAfft|p$3f(k4?hG)NsLbyKAZ2~I8$&| zDTGJr){nyEv=}7ek(Yd~1hE&ElG(?~{hu+53eg-X{r=5?-X{I9n%_A-tJ`~|@2SnA z`bz7E&M8%k>(zWdh#GKaRjj~+@QXH@RyO>ZU3~^oJ>qpf9|wuB7VYJ-IEUKT#Vbi< zYq!<*dQ$Lmh4P_a*eQJ~ANfgGF70es|55QmSPbjAQs$xbdI@URbwT7*{o$ ziFU)d9@kpCJJoqrExs#9A9GQ;TG3R-Y%9vmI}V`ZFlGf~e-2|#Fm{;JY{c?%a`Ix% zF%ie<^v^-(4Rwl!tUfKC7Ey=%%*JtjkRQzDXST-t=;SA!{Jc-{U$y#{)vt;7>4xZi zRN2UfJfIlrXGENgbbVws0-v<@c8oeBc30RO5yQ7YK6bHeb#~!u^hwT$=#!l2{UQ$W z1LF9SvtJVZ4+_6wG5W=iy^#Z)I_T^a4Euls1J)^ss zXC(6Ig;@H8c!?#Gk;PipcU4UUX!PvRSrA*DTEoQ!M)N0-06Iajryq7R~3yf_x?*cI>gBZ|DjwL z#k)it?3cu`!&hXd|85aEvg&~Qy&~dGaPQ7%(Bj|Z!=3X^i39(wJm|b<>X9FreBAR* z5qD3IE?-76IQ=slx~o4fnfkm3=YLBwIR4Cz&OEopsRw7?3Gurk4)%NE*x@eMeaX~x z`lMuXy4j{A;{(oY=yycqCKs}cos-P&oIWp^+*#cgZ|jMO_l6()#EviTZBc~%Tzf)a zw%C$5b7BK?dt8ys+iTq8s&w$L%E4W(iNJVouBWVIdZG?K>mslah`CFI-|}nPJfL#17aKp{YIwe zrH?s7DPOJMt~&kAA11CBhe@*? zB%$vn``w`DhMnXRy%%&s?WwM;RO`#G-|f1+WWN=-t*{fgjWAZ`a5o@sI2RXo{MJq* zA5c_8{%l2^c0~C*JMHym9C!`&SJWMF=B<`{XQzEHinptAw9}ObU(tC=I&6De!F;9G z*n=xL&xl*qaodU-QbsUKd29X9O3?G;u$x3NiHf?j=hBFN&RN-M&Pv#Zrp^W9<}3BE zm!uruvl)b2&7{1~y^v=?I*uO79!|fL`mVO3O|Mn!>_)zqgi)tf$zqqK{ivnbg0q&| zQQYV)rFi2%Tu!mB(`k5#w}3P{D2{p+DJ}Y5S>ji0I$u}WuTAH(;lO`4)aW6{K6Z{#??0ISYT;jD>yGpvk#7(uSm1t=^e~>WZ{3cZ>D>|%rHGr*UoZ9HZ|@3`R?>Y{M(t$**KFg z&0gL#{)RO9;4R;wZ1!K(jFOjF7Bldtn4&bbm<4_d*bnBL@zxD5LQ7oE80t za-Ei*l(6vghVi4R#r^WG$ic4zGgXo>2h5tqOvx@uepAe}^o)dk@P8{0_>_ctvzmn3k!IrcLbmnHDODh7NtAjQC!1dR=9aH28=hX7MKHbGl4d`eUf-9#En(rWOXEjd zt`B6B!|wZz>{*G`<9=5p@OHPW8E5DDP?$XMoCjQ!P@j6(R`0HC>XD1w>k>Hge)6^aBYo@YD!0&T6!T^EKMS)PT1d9og_!Ba+?kwO^wvObk3Vwx!{$#@Dj*HDY0E zz*~);YKhz)= zKOAr6wluSgW_HG;zm<$g#wFIrql`EFoiOuvkj={Xvf+s1uJFO--z)C~d{dg5Xsh{y zY--xPGJgjWc&quN>;;L{d@LL8KtfG?aMW0orpAp7Pi7cx`F@hk-CDk%Wy2jx$cGP( Rd=t{-J1zZ>{v$6){snCV9kBoa diff --git a/test_conformance/vulkan/shaders/image2D_r16ui.spv b/test_conformance/vulkan/shaders/image2D_r16ui.spv deleted file mode 100644 index 87514d9fab1809a8a08645f9fc8a489463837db2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3264 zcmZ9NiE>m`5QeXigiQow6GaS*pn|Aj5k;27#32#^0}8IgWagS&GMh6uKok`b^>us( zAIegztn&M2Zd^mq&h0ZvPBZdE@xWQ?I+@sbsBc;MXL+^O%krgG znrHQDzS>Ru)vTSLu=f#8$ezm8tChK#YQ5X7_Vd+dT5V?SwA#peWX|rU#;q^KW$k)% zrBMzTC8B(`QBJ#o{Oy(2jip{%YtY{)ci@>9o7F2Tt(%?Ra;4W<>Eh8hnmmopTD8S= zVtTf5Uv4CM7Va9yZ4os_MzM>$v%}Eov|sOK-MrH?(I|JecMvhmc^G?;b2@8DTjywS z6Vr29KOb;@&!se5T*{|by%+PGLH9cMu-6a16Ma{jorPL+wtcr#ujN^%Jv&{*&Y*iazuDX7sr~@@&U;?JMqS*y~90 z9Gv}oclIFm%yFjYvBwc>noGP7aarpHw6W&ffpq}w*$<(O)o0v`XnT_1!^|E*yT`oc zW&B|z`hE%fO=K@QUPil5&YZ8HUGnxW_B*=tzdAGrd&JJLJ=j;A9dnsgBn6P3v!<%_krE9%H-zG&5>mV_nX`pD?3nYdH)47Pw#RH}kCr_P)G_!1{fU zW$arlclIY))tGEaLn{PUGJxc;o%vV(;)A+B2%X;|u7Eh)e$@TE9B(U<%tD zf#1cphq%vaY-8lTPw{!g+~(4bUf;vESHF4Wt6m|73{-E)boC?BJy#!*9tDq^C8$g@}5ULi&)=!+EMR1w)Mt- z?!x~uw%j$oowITiagV&`pD(!B{|UI9|5LDBobNMi&llg`9zI9p<9uHfT;%)`Y)_Bq zVGLbGjFAuSHnzNZqxTy2Z6tbMz_uTGd%uO2i#lInm*37J*ta8ZjBjTNkr#U(8R8u* z&|4jS2Qfz88fn2rjV8EUqXo8xeAH-T%SVk4_ORDsjV{<2d21}A<)X&d*yS2Mur=hP zMju-~YUJ4S1@;^(hK9gP40 diff --git a/test_conformance/vulkan/shaders/image2D_r32f.spv b/test_conformance/vulkan/shaders/image2D_r32f.spv deleted file mode 100644 index e82c9c190df248347e32b8354713ffb95d8d23f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3268 zcmZ9NiINjl6oy+!hE4WO6frE~0*=Zii{Q*SOc;%TfC6qIlQfftY$iRxC@Lbz>-Y>l zl%-Z#<@a^^T3z0$Q|J8uIrl8L@6D`Sv42$*Jr}Kw)<@5x@!A}%fQcgY5%jufBE!|% z)!O7JZA~6K{*I9wqLr%5w=r53m9a}mw~_SZ*CD5oP3)K7j8t+l|4RN=pnnIHqBT*q zR-e8yQy;~H#;}pb^-;Ugiih?7!kxI8j*MAv%=sJFf-8P7=p@Y~tv7~A+U~|_(yXV; zgLqU=dg)PnFEJT=s+TTRYv=3D!Js}$mpgI2ll05L=3_W_Ewr z8ck>T=6`r5!?(e$M%tK08{f(C47v*TjFcCU3q*vO_k&$kdXw{Z8SlLN5Ldu^$1uar zTl9-@v8B+nTM$0MUwP@>! z&*a#ea)-d?TaQ!qF zOfO?s5Nn!Cya#bv>lL)I=G%s~5AEy+(8lUB?p3rs$?u?t*D^kec5#1S#}-?oxZLa6 zg&E$!eh=AAzBkeClQaJzv`gMO#C}tk{>ibK?GYaZ+mAhlxlUkPGkgp0fIS(1Cbyl_ z`C4duE+P8)Imq(KhkQ@5-G74nYF=Yq&h#ft8Eq}^g})2-Bli3G?gRGh4i>O}-(&EL zeV0W%SHSM~{RO|+_ZM)Cefxjd_ox3X{ivTuyqizxTD&ReynpAI$o}QD?cMwK7c*`{ zJFEH+a_vCxL|poP&-&HY@_c<`=J1!o`&B`_lis@!vlqL9{6@?^^nS#B@_&;@ydANg z`L)B|x3EKg@5S4QcSYV9@0I_oy|G*awkN&-1;E$cMB2H0Q!RSHR|xcOLOai1n?f9qL`fww}4n{TU(` z{GVfccENugTkbO7&bx90agV(7U(LC&{|j(2|CeC7FyB|$&KJJDJ$#MGhxxwAxsbCC zwx`GRFoC{>7$YCJ2KFt)yrK66Z28c86We~|?foWNF4S4X-h$ZcB)X0GcI1um?Iei2 z*z>r9cm@mXX`$~T#>iXacFu(wU2w5R4{QzjP@|76A8HJ+?KRZ+7TXwkYjn_Zp~euq zSYrgXhJ2`zV#|jbOW4jKc8+_9d7EHk^~;4C_pysL9)PVOA8IUP%ZD1@VLL~t@jbTZ zV+~{V%lTGnXz#At@39&E5Ltt4MM57x&o<2PE4JKI V#C-bX%(o3~z8&a)_>X)N`4=`19>M?s diff --git a/test_conformance/vulkan/shaders/image2D_r32i.spv b/test_conformance/vulkan/shaders/image2D_r32i.spv deleted file mode 100644 index 7ea8d26f9c273accbaee061c9b89743cfeb9aa3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3256 zcmZ9NiE>m`5QeXigiQow6GaS*pn|Aj5k;27#32#^0}8IgWagS&GMh6uKok`b^>us( zAIegztn&M2Zd^mq&h0ZTNzbL&R9()-BRJG z=)~2tOkB((0b-^|CR#pL2qXQox%N7v!3=&V#d(ph-){PM>61y83(UN z%PHcGXzPj37TB6{N5SUXjEtA?Q`q{C;dP&V8KdYkuWv@5`y^G6UBj00e_n&4)&1Plxxn_G{tqt~_#FKh_ax#xKBjB&)`D~9&T}IBm(#X)XY4P|xC8B3 z)qjv{7kW41((m`xueO%=>$@_CzYfmSIN}^SYZ0>_dmQm8i2LOKCXaY0Vm9yEjyNmw#vDPvhR830525{sCFlA47GnFGK%YS5d~@!1E>0ryzY-%pU2x9W z17bX-*@-h)e$*TE9AS zeSmF_xbG|2hmok~{a!`n<8H4NT%6}auzBP?k9ZcbzV)=D-gRv2nakWa5V`Pwgzeph z|6^>qYkWIryOPz9_iJ`6bw%9?`=X zx{4ShAKYzhdGki^HSF6+^uB;?Kl1i|3oRFQzQQiQokg&3N8T9U&JrRo_C7MiJ6NE% zI{FS`jJ!3{f{PkWaJfbcYz_IS(Z-gK8XfFmufrN$urc!1SVqf5jjyrGHF{uc$VZJn zwtUpcvF8iyIaUz!);XuK`sJd=UF>p=dthtGM~(Z~@=;?I+jEGm@eShrSi@NTa=w+z zXlGaL>}*4Si)=u)Bhkl$f)D&1*!g={%*yxJa>jXA`sB**)psJkh_5m<0 diff --git a/test_conformance/vulkan/shaders/image2D_r32ui.spv b/test_conformance/vulkan/shaders/image2D_r32ui.spv deleted file mode 100644 index dbcdbc5f59437f9b98223a30b7e547e1f83e30e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3256 zcmZ9NiE>m`5QeXigiQow6Gcn_K?PC6B8n`Di9;j;1{7R}$;>smWHx7RSQHfz^>us( zAIegztn&M2Zd^mq&h0Z*tMQCr-X@OMUbVA$JFVw^V>TNzd-Hm@(tF)zR?qTkt(WD?tu)W- z)%<=p?N_sQe%#(iI2n5?SFTj%XRGyYx7yF|H`8h}Yp2yl)+2LvCpB(;DK2Z*o2!j- zz$g*rvyF1v4didHwyrPt(prQ5M!5seywt2-UTxjz^j0dp&T1ErzR~1qbk?dZrIRyr zjeBw<$+K`*Ic|%nF*1r>HFS`c}}Byox9lU2j7XlE6vVgtvT1e)2Y|;tka&GDPm{Q^-h!6 zkz`?DcY2Nf)BxZ74^Iy;*O@eGd2I@9{7QkR(G{?Fq&$OMBqGjy0PL#Jo1D{SyyxAI zxB^cM;Q)KyvR|y9u^RZDLF<{v{aXsW2fdvMbOtA=W#uNuGnV zfA7v7#GX0M^gQ-BVoh_2_aQE8y?{2>d^@oAqdogUw6Xe(dl79<@_U%s!)W)Ix4ev> zK%(!Lu-`=XlH+Bx`{c~|3fd)a?_$5BOaH4wbFfG34BLZ!#aT{bTQlz8?`}`Vzg^h& z>6z+iZQr#12HJe`k?%3K`%f{W<~7#k4EzZ*inf-s;BSHZ#eOs2dSLJCPzmezJ%(TG zTP)+*5_Z3DF8pHOTwr@o|A$u!e3pKUdlGRTAJesXYr#2l=Qxr5%W2!YGxir}+=2G2 z>OaV}3%wh0>GuumS6j;y(Gm$s^v0SkL_0 zvG*u;-v-<fBc4O7Z$0g(cMaQm<}&wnL@xXvVS9Js z{}@~DD&Njoxq-Mx-t#XMT4i@RH zj=qf;BX5ng;G#woT&~dqTSGo-w6W!*MhAP?>##-_Y>d1$R?u=$<7@14jULz<@=>FY zEgv;N^o%KwDECHGjaiX3VSe z_Yjefnm=NnMxy2;Y`KSsHTB6^<1E@5=L@{M!0O2N6Sj97`F_ThdyJS*pPc!2pv|`n L{SW_Vz@!~S diff --git a/test_conformance/vulkan/shaders/image2D_r8i.spv b/test_conformance/vulkan/shaders/image2D_r8i.spv deleted file mode 100644 index 1a64147563f2356166183920112ca58aa9f3aeb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3264 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 diff --git a/test_conformance/vulkan/shaders/image2D_rg32i.spv b/test_conformance/vulkan/shaders/image2D_rg32i.spv deleted file mode 100644 index b7d302f4a70b50c0cae567bade858cec703577d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3264 zcmZ9NiE>m`5QeXigiQow6GaS*pn|Aj5k;27#32#^0}8IgWagS&GMh6uKok`b^>us( zAIegztn&M2Zd^mq&h0ZvPBZdE@xWQ?I+@sbsBc;MXL+^O%krgG znrHQDzS>Ru)vTSLu=f#8$ezm8tChK#YQ5X7_Vd+dT5V?SwA#peWX|rU#;q^KW$k)% zrBMzTC8B(`QBJ#o{Oy(2jip{%YtY{)ci@>9o7F2Tt(%?Ra;4W<>Eh8hnmmopTD8S= zVtTf5Uv4CM7Va9yZ4os_MzM>$v%}Eov|sOK-MrH?(I|JecMvhmc^G?;b2@8DTjywS z6Vr29KOb;@&!se5T*{|by%+PGLH9cMu-6a16Ma{jorPL+wtcr#ujN^%Jv&{*&Y*iazuDX7sr~@@&U;?JMqS*y~90 z9Gv}oclIFm%yFjYvBwc>noGP7aarpHw6W&ffpq}w*$<(O)o0v`XnT_1!^|E*>o;$C z8SfoO-!EamiR>lE%V_t>ne!F2OWxkaen*%7SBK_ckJuTu2kXXJPGMU!?%(fjPsYDp z*q+TZ)zR+tP3v!<%_krE9%H-zG&5>mV_nX`pD?3nYdH)47Pw#RH}kCr_P!36uzufT z_{F}(GM*`6_xt9;FZRs^w)gaZc)7sm=*PGx5$EwSU5mFCoHKWx6WPC`nQwY*=yxjFoGaHhr)=g?V;nElw}$Zy0PKp#ZhC;vBj#5)n| znO{5h9>b3O&c$)WS&=v92>LZdehGXC?LRCz&*!%g+usEG1S02~bH8(O5|RIv81d&mB#2ESDZez=vH+rvO-$tVM1#J6~xA$9Uxv29McKPirf_*#k#`t!Y5P7lpks;o} z0=?DIcMxObt&tX7)M$dsHCkY6$VZJfwtUp+U=Mp8*64zbk+;S&S}tmQja{zM16xBr zYV@(?qehNBUtrI%f|$3?IgQmX7d7r;muuVuTSGo-+{c!W8mrizLu`$25bwtt#_E^z ztz1SsyJ}}=8~R&h1F{{7J{}Z&;P1fB-@{^7zQ>j`&b!hlSAMU)6Y)i~HPun`2W)G` zygGjm5&5Y3Bla02YCgi2dx%(5pPV($p{;SDz`F~qj(k61d$*DAXKcC0i23x%nQsT$ Ne7n&9@E`dM@-I{S9j*WX diff --git a/test_conformance/vulkan/shaders/image2D_rg32ui.spv b/test_conformance/vulkan/shaders/image2D_rg32ui.spv deleted file mode 100644 index 6cf2f1b8ff79b915b32ea0c3763689988fd4eaa3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3264 zcmZ9NiE>m`5QeXigiQow6GaS*pn|Aj5k;27#32#^0}8IgWagS&GMh6uKok`b^>us( zAIegztn&M2Zd^mq&h0ZvPBZdE@xWQ?I+@sbsBc;MXL+^O%krgG znrHQDzS>Ru)vTSLu=f#8$ezm8tChK#YQ5X7_Vd+dT5V?SwA#peWX|rU#;q^KW$k)% zrBMzTC8B(`QBJ#o{Oy(2jip{%YtY{)ci@>9o7F2Tt(%?Ra;4W<>Eh8hnmmopTD8S= zVtTf5Uv4CM7Va9yZ4os_MzM>$v%}Eov|sOK-MrH?(I|JecMvhmc^G?;b2@8DTjywS z6Vr29KOb;@&!se5T*{|by%+PGLH9cMu-6a16Ma{jorPL+wtcr#ujN^%Jv&{*&Y*iazuDX7sr~@@&U;?JMqS*y~90 z9Gv}oclIFm%yFjYvBwc>noGP7aarpHw6W&ffpq}w*$<(O)o0v`XnT_1!^|E*yT`oc zWxU@s`hE%fO=K@QUPil5&YZ8HUGnxW_B*=tzdAGrd&JJLJ=j;A9dnsgBn6P3v!<%_krE9%H-zG&5>mV_nX`pD?3nYdH)47Pw#RH}kCr_P!36uzufT z_{F}(GM*`6_xt9;FZRs^w)gaZc)7sm=*PGx5$EwSU5mFCoHKWx6WPC`nQwY*c`l{x%%aHhr)=g?V;nElw}$Zy0PKszVylmDAM;+=@~ z%Lk6}lC=i)fxtjHU41pOK!zXU#n_8*p<=kr^L?Qa5o0+I90x!;*OiOBy-jQDiH zIb#oq@tn@GygB`zVskocXA$QwavJ|m!5i=Q7JG;1(4JB49bZ6SL|pnO(fZYK2UFPQ z2>dR#J;Z%ZV;dvyeTvT`<~Emh^!gsQz52}~Ujd5s0wmIUyuV5cWqMrAA6_Jm-y;g8>o)5w1k@q~}S;YF*(~f%Av8`t=bKgMZ!v7Jr zcNhMTvE{Du?VOdHhEf+Pu#xB?Bfvq7Q zHTu}{Q6tBmFR$0ojg39}fyX@ONP6?_n`3-($-e=UwTOE5BFYiTEPgn(CX)B`4=;29f|+| diff --git a/test_conformance/vulkan/shaders/image2D_rg8i.spv b/test_conformance/vulkan/shaders/image2D_rg8i.spv deleted file mode 100644 index a71b9bf08a654f4a68efb190656be3d91cefa7ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3264 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 L{SW_<&mjK-*xwyz diff --git a/test_conformance/vulkan/shaders/image2D_rgba16ui.spv b/test_conformance/vulkan/shaders/image2D_rgba16ui.spv deleted file mode 100644 index 84c3d3db7a6147478654fed0abb9f462eb5831c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3256 zcmZ9NiE>m`5QeXigiQow6GaS*pn|Aj5k;27#32#^0}8IgWagS&GMh6uKok`b^>us( zAIegztn&M2Zd^mq&h0ZTNzbL&R9()-BRJG z=)~2tOkB((0b-^|CR#pL2qXQox%N7v!3=&V#d(ph-){PM>61y83(UN z%PHcGXzPj37TB6{N5SUXjEtA?Q`q{C;dP&V8KdYkuWv@5`yjdUSnO(z@IRqXlpqO{ua1j>^JkR2ll=Wm#}`{WBA3s z#WJ2LVfXvy!Y}sC1-AF}e|WjT=jg|{ClTlIFoVL9?V}EhR9ca(0 z{)1e*(7O?re&4WuwY9uc-<3K1b@2O-BhI0-7BTy=$C2NNIe^+7Z`JId7h_fPZ%n|f!i2M@x5ZZrOa-Pp`A-2B>^a(`HH|Kt5>LeonD>35J1?P-C zAjWe#%kt**dy38Jter)izsPC)I|XmN-&^b*oRn`?^Q%T?)F;2#d$sin@8UBh-VS&TTeUcUB|Ybxy*e7kqiGv*xp_E zKgO23#VxTw(tmus}Z){u`HZEX3d(ZL?}I;_zJ8zXOxWwcz>_!_%hqX)KzeAMV; z%SVkId%nP)V+Ap9opTziUoL9g#V*&l2eyWM)VPl=A2n97J%`vD-yq(PHH_6S=Ucgq zc6Qay&NlS7$OdFP5`8=<_`u(Roxg|0tbC6xXPkGXPp-_O``j}i0flQZ8AwE1?S K|KUIK8RTED^c_L~ diff --git a/test_conformance/vulkan/shaders/image2D_rgba32f.spv b/test_conformance/vulkan/shaders/image2D_rgba32f.spv deleted file mode 100644 index 35136c581b75c00ea5c883aea3a67fdbbc0204ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3268 zcmZ9NiINjl6oy+!hE4WO6frE~0*=Zii{Q*SOc;%TfC6qIlQfftY$iRxC@Lbz>-Y>l zl%-Z#<@a^^T3z0$Q|J8uIrl8L@6D`Sv42$*Jr}Kw)<@5x@!A}%fQcgY5%jufBE!|% z)!O7JZA~6K{*I9wqLr%5w=r53m9a}mw~_SZ*CD5oP3)K7j8t+l|4RN=pnnIHqBT*q zR-e8yQy;~H#;}pb^-;Ugiih?7!kxI8j*MAv%=sJFf-8P7=p@Y~tv7~A+U~|_(yXV; zgLqU=dg)PnFEJT=s+TTRYv=3D!Js}$mpgI2ll05L=3_W_Ewr z8ck>T=6`r5!?(e$M%tK08{f(C47v*TjFcCU3q*vO_k&$kdXw{Z8SlLN5Ldu^$1uar zTl9-@v8B+nTM$0MUwP@>! z&*a#ea)-d?TaQ!qF zOfO?s5Nn!Cya#bv>lL)I=G%s~5AEy+(8lUB?p3rs$?u?t*D^kec5#1S#}-?oxZE4+ zn*R;tJ!Cie-bA}k&iseaE_vq=`%PW?C&y;CM|>1)KlT{rI)QD?@GZOp);Io4Zrg|R zwb1rlLiF=|ajX-o0;sG2=G0 zv#S3f*ADbf#HHW&tY2*{&(}9*4u2`UUlqhV>Aedvd$B9XZ^Z0F??>Dx|2KKW+Y#%T zUpwr53p?cZUc8NXSLBWHUir^Tz70NremCcw&u<~NKkv~oM9%l;e(%(AME)5uV(+b- zckCfC&Uq4%H>clIY)UOz_H5SRW> z(E8OO*F|h|g!8_HeGm!tJm1TRd^p=rb1uwt1#BL9=MjH|Sl@cuq24uY>zT{kpCNL= z|2ej27yQ?;yel^l_sBc{)tn3azW^8We+iZg^L>TweBs;M!`Fy>nD3jM3pwjx zdwNU{6X;urG4g?HVBbQ_8+u>BmJhu*vF%6R-fyDiLY+nIEr`8NqT7gXN8T9UPJ+mb zJ&!wxXRyGY7Wyt?jJ!2&=Uk}K1s7}dz}AotHTu}{p~e8)UPFycn*1#-<6-R<&5*J^vM<9tM5eY?}|0m zq2?oOYkIFjji0d}74T#1QyDkDpTA(s8D~v>a@IJ9w#HPBcjj0f@;|}$Y{Lw{V#_^6 V%%@MzeB03G+kyUv|Hvnie*q<59>4$q diff --git a/test_conformance/vulkan/shaders/image2D_rgba32i.spv b/test_conformance/vulkan/shaders/image2D_rgba32i.spv deleted file mode 100644 index 4d1ae58107ad1e187b2a0c8a0048026b900523ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3256 zcmZ9NiE>m`5QeXiu*xQzC}LOy6+{h-D6%9b4v`2LP;eb4GuPyj*_^onqNs?duj4cL zP?lO{mESjWTW@(%UETlReY*Rc+h?+R)xot%@<#m$mE7*k%FiAK4zy@QBh&coP)oKsm#+B!#r8=soZ z`uTu+9d0qr78di#74OA7XVAUQJ?wRZ??m5~W@ob0y+(gxfN%YaCkL48Od7SkHi0&Nslb!y3fMbRo<=Sa5obOKc2($2&gnAV^BzE4 zf%gyL0DIoDU#y?88u*<->zT*>TME1fy`2ek2KQ6VdfGdQS%V%!T)V+Mk^yJT7Sqd-g+UWAz#L0@|MB_b{_Z(E80=Uc=8S|_F&yO%PDMY#{K)`%_P1MOMW zzmsbhdN<Hy~W<)Ikaa~d&d{h7ZI2K3ABE7+`%NaIRd|f zZ4YsuQ`pAHd!OR-h`G(B9lgGbZLfaw$XCIZw^wITY%iD4?pNFEd+5uEOaCldzdCZg zk8O^)?05CgL7>&p%givHxRmIsYeMxj5ga*q$%Gy*+$}$jA9UFSyA01=yY*(Zd>a z6){FWxZBwB=8fKK*te1BeIDC>3t-=lyfMC=MMPfgePoDtFi&rF z^c}<)d26Hv7d4vTa*Y<)8uC%2jV&KFI@rTrhc&ujW8|%|gqDjMUtyPP^uX4Tj~ab! z`KXa&&lT8nEFm`5QeXigiQow6GaS*pn|Aj5k;27#32#^0}8IgWagS&GMh6uKok`b^>us( zAIegztn&M2Zd^mq&h0ZTNzbL&R9()-BRJG z=)~2tOkB((0b-^|CR#pL2qXQox%N7v!3=&V#d(ph-){PM>61y83(UN z%PHcGXzPj37TB6{N5SUXjEtA?Q`q{C;dP&V8KdYkuWv@5`yjdUSnO(z@IRqXlpqO{ua1j>^JkR2ll=Wm#}`{WBA3s z#WJ2LVfXvy!Y}sC1-AF}e|WjT=jg|{ClTlIFoVL9?V}EhR9ca(0 z{)1e*(7O?re&4WuwY9uc-<3K1b#SJ}5$DiZh?xD@zQ9W z_8!BI{LaO3#95Iy<_P*VM1Bc;2<<;CInU>}5Zm7b`UE29n{&T2brO;Pl^F5qf^)_m z5aT(WWqEV@J;mm9*3Kf%U*t6Yoq{*s?=AKY&!Ih|+B?30zKFQ=Ponj!;|`{<%@O!r zY9tG`qh!^ z18j4|eP6*oj6^-}_bMVEcYCei;yfRM%_Hx5#IuO?t*0IJu47xzT;{%k$c6tSZ0|1o zA7jg1Tu|Vc$lg_XTYGk+=6-Xt}8K6?XaUEP{PI^2YdfmJoTd_mLsq!2-S2 z(RUDI&16xBrYTU<`j~c7ko` diff --git a/test_conformance/vulkan/shaders/image2D_rgba8i.spv b/test_conformance/vulkan/shaders/image2D_rgba8i.spv deleted file mode 100644 index edf8c58ce7cac895e99bc4c63cd0960c96e7f944..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3256 zcmZ9NiE>m`5QeXigiQow6GaS*pn|Aj5k;27#32#^0}8IgWagS&GMh6uKok`b^>us( zAIegztn&M2Zd^mq&h0ZTNzbL&R9()-BRJG z=)~2tOkB((0b-^|CR#pL2qXQox%N7v!3=&V#d(ph-){PM>61y83(UN z%PHcGXzPj37TB6{N5SUXjEtA?Q`q{C;dP&V8KdYkuWv@5`y^G6UBj00e_n&4)&1Plxxn_G{tqt~_#FKh_ax#xKBjB&)`D~9&T}IBm(#X)XY4P|xC8B3 z)qjv{7us*?((fDAueO%=>$@_CzYfmSIN}^SYZ0>_dmQm8i2LOKCXaY0Vm9yEjyNmw#vDPvhR830525{sCFlA47GnFGK%YS5d~@!1E>0ryzY-%pU2x9W z17bX-*@-h)e$*TE9AS zeSmF_xbG|2hmok~{a!`n<8H4NT%6}auzBP?k9ZcbzV)=D-gRv2nakWa5V`Pwgzeph z|6^>qYkWIryOPz9_iJ`6bw%9?`=X zx{4ShAKYzhdGki^HSF6+^uB;?Kl1i|3oRFQzQQiQokg&3N8T9U&JrRo_C7MiJ6NE% zI{FS`jJ!3{f{PkWaJfbcYz_IS(Z-gK8XfFmufrN$urc!1SVqf5jjyrGHF{uc$VZJn zwtUpcvF8iyIaUz!);XuK`sJd=UF>p=dthtGM~(Z~@=;?I+jEGm@eShrSi@NTa=w+z zXlGaL>}*4Si)=u)Bhkl$f)D&1*!g={%*yxJa>jXA`sB**)psJkh_m`5QeXiu*xQzC}LOy6+{h-D6%9b4v`2LP;eb4GuPyj*_^onqNs?duj4cL zP?lO{mESjWTW@(%UETlReY*Rc+h?+R)xot%@<#m$mE7*k%FiAK4zy@QBh&coP)oKsm#+B!#r8=soZ z`uTu+9d0qr78di#74OA7XVAUQJ?wRZ??m5~W@ob0y+(gxfN%YaCkL48Od7SkHi0&Nslb!y3fMbRo<=Sa5obOKc2($2&gnAV^BzE4 zf%gyL0DIoDU#y?88u*<->zT*>TME1fy`2ek2KQ6VdfGdQS%V%!T)V+Mk^yJT7Sqd-g+UWAz#L0@|MB_b{_Z(C#sBc@5+L z>-$BVZyvBiuFT=DgEKXTIET(!#O%i&Lw+UZ0Qw-}KKZ}MBi@Nv&-~i4 z_ZW8McP@@2&WgM-N6@b#@{8a@X#Zi!c|N~|*#5@RClEQ`oco=rlZgB;#E4H9oHO=- z7|-b}%bU~hDK@9Gb{28|BB$|h7rgO)Z?SiH4(%D$-th(WMZ~3l0Q_q?bTTn+sh@i`_=aP9{Muk(m#vVuZ~>r zW1A!H`wI49B9ou^5GWQKcF8m*2dw1dg z2wUzN-_BXNiMU7J^UoDr?Ee^C&i@HmF3$HUw&#m)Zx5d#@^QY;3odeg0k)?{^sok9 zMU0UT?l!i(d879l_H873pU1Wzd3(QwmWw)HVwc~}0@$}BZ;Wqe5s?>r9~t5u%+p&P zeFrf{-WqAaMU5u7T%!fHhJ4g$W6MX44)(CuVT~@>7qmJ+L+8qedTF zK5FFHa|QMs%ZPdFoYPqSa#7pYl1zsI&_%&YVF z5Rs3XKVY9hqUIxPxrc}~^~qV|9NHQe3cS0(>d5yaws#x(e!`Y}jF?ZKocVU3&9@8v KH~*2(ApZckOdUf2 diff --git a/test_conformance/vulkan/shaders/image2D_test_formats.txt b/test_conformance/vulkan/shaders/image2D_test_formats.txt new file mode 100644 index 00000000..03c4d49f --- /dev/null +++ b/test_conformance/vulkan/shaders/image2D_test_formats.txt @@ -0,0 +1,21 @@ +VULKAN_FORMAT_R8_UINT;r8ui;u +VULKAN_FORMAT_R8_SINT;r8i;i +VULKAN_FORMAT_R8G8_UINT;rg8ui;u +VULKAN_FORMAT_R8G8_SINT;rg8i;i +VULKAN_FORMAT_R8G8B8A8_UINT;rgba8ui;u +VULKAN_FORMAT_R8G8B8A8_SINT;rgba8i;i +VULKAN_FORMAT_R16_UINT;r16ui;u +VULKAN_FORMAT_R16_SINT;r16i;i +VULKAN_FORMAT_R16G16_UINT;rg16ui;u +VULKAN_FORMAT_R16G16_SINT;rg16i;i +VULKAN_FORMAT_R16G16B16A16_UINT;rgba16ui;u +VULKAN_FORMAT_R16G16B16A16_SINT;rgba16i;i +VULKAN_FORMAT_R32_UINT;r32ui;u +VULKAN_FORMAT_R32_SINT;r32i;i +VULKAN_FORMAT_R32_SFLOAT;r32f; +VULKAN_FORMAT_R32G32_UINT;rg32ui;u +VULKAN_FORMAT_R32G32_SINT;rg32i;i +VULKAN_FORMAT_R32G32_SFLOAT;rg32f; +VULKAN_FORMAT_R32G32B32A32_UINT;rgba32ui;u +VULKAN_FORMAT_R32G32B32A32_SINT;rgba32i;i +VULKAN_FORMAT_R32G32B32A32_SFLOAT;rgba32f;