From f0d94313b8e71549077a637b607e22ec54c5e995 Mon Sep 17 00:00:00 2001 From: Sascha Willems Date: Fri, 13 Oct 2023 17:02:04 +0200 Subject: [PATCH] Updated HLSL compile script Recompile mesh shader with EXT instead of NV SPIR-V extension Fixes #1078 --- shaders/hlsl/compile.py | 6 +++++- shaders/hlsl/meshshader/meshshader.mesh.spv | Bin 2264 -> 2700 bytes 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/shaders/hlsl/compile.py b/shaders/hlsl/compile.py index 2b44f4d2..eea29bf3 100644 --- a/shaders/hlsl/compile.py +++ b/shaders/hlsl/compile.py @@ -1,4 +1,5 @@ # Copyright 2020 Google LLC +# Copyright 2023 Sascha Willems import argparse import fileinput @@ -33,7 +34,7 @@ dir_path = os.path.dirname(os.path.realpath(__file__)) dir_path = dir_path.replace('\\', '/') for root, dirs, files in os.walk(dir_path): for file in files: - if file.endswith(".vert") or file.endswith(".frag") or file.endswith(".comp") or file.endswith(".geom") or file.endswith(".tesc") or file.endswith(".tese") or file.endswith(".rgen") or file.endswith(".rchit") or file.endswith(".rmiss"): + if file.endswith(".vert") or file.endswith(".frag") or file.endswith(".comp") or file.endswith(".geom") or file.endswith(".tesc") or file.endswith(".tese") or file.endswith(".rgen") or file.endswith(".rchit") or file.endswith(".rmiss") or file.endswith(".mesh") : hlsl_file = os.path.join(root, file) spv_out = hlsl_file + ".spv" @@ -56,6 +57,9 @@ for root, dirs, files in os.walk(dir_path): hlsl_file.find('.rmiss') != -1): target='-fspv-target-env=vulkan1.2' profile = 'lib_6_3' + elif(hlsl_file.find('.mesh') != -1): + target='-fspv-target-env=vulkan1.2' + profile = 'ms_6_6' print('Compiling %s' % (hlsl_file)) subprocess.check_output([ diff --git a/shaders/hlsl/meshshader/meshshader.mesh.spv b/shaders/hlsl/meshshader/meshshader.mesh.spv index 7e7eb60d8a30989e96f5a3252ca1b6a76556d9ce..110b8ee15b4cc87056731c55e59545e2e1b3d5d5 100644 GIT binary patch literal 2700 zcmZ9N`*KrN6o*fnCU}J+EudgciZ`T26f7umDHK~2O@UJJT0@(e#-S#Yq^SSZH*g%s z7w`dOd;y*cN1buT?>pIR=9tr2S?jm%d+ke0`|x^%ukv=Y{jG*^NRJ7q3{{{>e)ZW8$%7{G zRQ`h;lSC*#2N@su*Ob46)_lKEpv>PM(VwNpY*Y#NIC?s~q;s?xE?0$*;#Ljvq zM?>uTXGd@?;bpv?qu;S1%ZfVpY7$x|Z}?d+d|Z!lmqv7>arzbGT$6FTP~=iK8mBJe zwE0D!OH4wYJ_nJXhF75zL@4it`~vUG(eA^*u8R&XPUG+Su0r;yUHlB>7x)0OwE{E# z+~4?VL zdAK_9Oxjy@K{IJ)?qwA(&xtji<5BPnIUn|_y$bgHs2A7ZW03vmKbvHG((c~avwHE1 z2^)WaN-x1{c)Sc(*5?(t^^KVU$60qB)_4`J&iUzo9In55@oNd&Q;lvA6cnqy|=9BE)&Omc`*w0zWd*NM>dk4byPSUFz zwY{5s|8J}0HP2x)ukrdtzW0zLPw=pvPqxq(`?!ED>V(}p;QB5?<~3fwYhmXj^~t`+=zpTh40WNqR1VZqOL zEBvk_Yx|jA%>NOj&iK%Mob=YVe`lob1~J~12IPADy7cLLv;wJLN$2hcvU@3Mlbg%= zYWsbvl;3aP5%td5x9)GIb`$PC${&%>nztbB?(Hgc8+t%Lo`p3?yYI!H^z#W^yWc-x z?PB%jRdz4j?>mtDXuLD>&U^}~{}CVYXGv$@KPBDgN$*_Dbqf9kqnk*GOyBLYs@pQKF>Xxw+y0|w#Gbdk*Ciu`W#|1+Kkzb zz8+Zy$H-9M0Q`b)%-QnS;G0(Xz&7IDV;R_|ez|wkFZgD3*9yJ`-FWjEeV&iV{qk)f z>dChQKl9}~K%tKBM7RD9{JW6G=$HEj+>^7|$^Sh_ZSszEhS~xhX*Ql&nJDj)wVhWx zd@s^`d(iKFu~*mCzYiHb>Mz6XMZ3H+aqGyt5;tcHD|tqpWb8+(8*>2Z`mQTKh_okr z-imf8*$*RK%ea2x?A<$TtlVDJS0!FX8ZY#BBArV;_e})1SKo}>K8_&m%f0lVx$aTm z{qfEyy({56mh9RZeLX4mUtcM&-HXq<<{KCF`p~0J$nYIczOdK#!OutDm%i}#urv2@ z5?I%KI%?4p3eU&ddyXyx^wW}_^yAl;{l{IRDL7R+7;kCcdmor8u-k*-tFt4 z0(^7dS@#A~zuzyoez|t*st=OuySWKGg9>o}-qBk?`x|29L&;|EZkhhSTmiAxU3BeHV+7qdRRPwJ8?%hnIk@)