From 2a5f654750c1a6d98cb2ec90777cbb1951d200a1 Mon Sep 17 00:00:00 2001 From: plapins Date: Wed, 21 Sep 2016 14:38:58 +0200 Subject: [PATCH] Fixed bug with a variable consumed by fragment shader not being assigned in a vertex shader. Updated spv file. Added bat file for automatic SPIR-V generation. --- data/shaders/indirectdraw/generate-spirv.bat | 6 ++++++ data/shaders/indirectdraw/ground.vert | 1 + data/shaders/indirectdraw/ground.vert.spv | Bin 2384 -> 2412 bytes 3 files changed, 7 insertions(+) create mode 100644 data/shaders/indirectdraw/generate-spirv.bat diff --git a/data/shaders/indirectdraw/generate-spirv.bat b/data/shaders/indirectdraw/generate-spirv.bat new file mode 100644 index 00000000..b4a3cede --- /dev/null +++ b/data/shaders/indirectdraw/generate-spirv.bat @@ -0,0 +1,6 @@ +glslangvalidator -V ground.vert -o ground.vert.spv +glslangvalidator -V ground.frag -o ground.frag.spv +glslangvalidator -V indirectdraw.vert -o indirectdraw.vert.spv +glslangvalidator -V indirectdraw.frag -o indirectdraw.frag.spv +glslangvalidator -V skysphere.vert -o skysphere.vert.spv +glslangvalidator -V skysphere.frag -o skysphere.frag.spv \ No newline at end of file diff --git a/data/shaders/indirectdraw/ground.vert b/data/shaders/indirectdraw/ground.vert index 5bfc2a86..891f0c1e 100644 --- a/data/shaders/indirectdraw/ground.vert +++ b/data/shaders/indirectdraw/ground.vert @@ -30,6 +30,7 @@ void main() { outColor = inColor; outUV = inUV * 32.0; + outNormal = inNormal; vec4 pos = vec4(inPos.xyz, 1.0); diff --git a/data/shaders/indirectdraw/ground.vert.spv b/data/shaders/indirectdraw/ground.vert.spv index ae9542d1b4983bd065bbd3e1e445cf774f2fde68..4ed470bbef42a7448819e7b63517feb5135e1166 100644 GIT binary patch literal 2412 zcmZ9M+fGwK6oyCIB8Z}h96VtG#RG_lfGBb*N>MAI25y@IJ7sI>ZrUQ=Y2v+!K7o&7 zd@65D{J-g5q&m&YtpA^Nnl)=T(K39}xfA-exlPwtU9LsgxenLr_iXNMZoF3C8=sn< zz@pP7ydgGc^9lAI)=UyJr%3Y3&rHkV(1lgZbD zN}*b)2l?85VK1oWqn&rbZoT%ejgG={F<&Z_i-(0`ke`~Is1$bJyObg|*OC%LJ<(x( zB`QT#sosYA!g7PchgxN`wH=>RcUbmN_9=e{ov%mLgF?yMr2L)2@-Zc=guA4(N>uYX zxNlhA6e4G*W_2uaVwjBv-ktMY!;hTJeqj8TB<2Tae&i;W-HrYZNm$$kJm^saGwyeS;(38STU)7x6l^ z;|q^HnD?`I^a@`)2lJkAqp~Mfw?r#r_3*yO=_3Qk$-y5|J2=mTx2(^uB zr*H7Y2lL+6%e%3TJ+%^_KTY!CKck)csMqeYBAsRUsYgG4j;SlyJ(FMq&(7V+%^a*s zh-aAD0?%losVOO8!TlD)oMTJR`LCkyhG+l7nHbN@9=p>L=4e6D+GETab8%k6Ong-a z@P(LTF0f~w;4D_3bY_AxW(CX{_q{6Ny*G42^78G#AuM{y-CipfbCj0Ye}!>_F^8>j zLotW%X58Ch>1he}oYPxsqBoo^D+g~nF5#V-73$=D?@8dz=Du`ncyF_rln(!0aqxK{ z!4KZ^@(&ighj8K z`#LX-4a<7CARVr`uZuC)+}9;>_+!sGeYN{7OQ*Ia33p-c;LtPLnRlx>D;>^iUXu=o zu&idYe=e^1jxU7a5SH10QD2#@ml9%PM}EF1IE(j6dUL#WVK{_k@jk`h$c8v3P*k3}2{9-T*9=o%lOtJn$qG_Vq zo$ku_&F(ne?Tvbqv^##*+fGN_{OOPB)@1y$4_n!=-yQUZ{k>j4?Ji!ww%gnKDXEjG z+DjeAe)7FZD<9+|%)-b1vf(~ujJ@LXWV772?`&8={Ak>5)_*qHOt^#M_5<5?^_v^m%tYT*EVzZ8FIjze;?}re5Is z0ghRkBYckFbD|PwkJUJ_am#4L$wi#C%@w^n=ZmP~S;Y3Hh+C|l#djxOD{;)inYwQc z_nl{){S;NKGe=GRwa;M9ur|=M_}iD*{Ra4GY0KX#vG)=CuVGs&_QlRs&U|mMn$KG1 zJI-pXy!pi5U*vO^#>T$b`;@zazqwAKNYnhMG31QW$Z9Too8|9iRyoz)K4Nt)^5z$N z-!ZFCN?U)=ZvIbE>lyzAtNmFcX0wc~1YRl7Uw>a^D*83iWmMkPvs>GHZlUH2?Ar?L zy*@&%9s9m5_iymx?b&lGa{t2kJYcB1N^`$ka`K92vj6YMH^X`X)kg`=?~t6n!M$H{ z#%_?=S`E~A{oQxI_T>2+=n6Hw*DI)Z?R&9L@AxVzA3h7%`grHz^BK1MpX4#df0D+@ z$9X@;w%#B3*wb}XKY4TeZWhsb)cW=()-P(`z&>32OE~$ca}(P-G1srK)cs=XwXuc>UdXu5rG**!HH6XYp;xY5T64X!QIIwp{f5Ew-GhM9<-W zAFg`FHdszo!v8ns>f2gH&8eUDTO}9y9)PR)9)jgmCG!1Jeh)fu`j~5tRs0`bH_`tA Da2T9F