From d3f5b81a669121288c3a57d61dc25dd091ac2ddf Mon Sep 17 00:00:00 2001 From: saschawillems Date: Wed, 18 May 2016 18:55:58 +0200 Subject: [PATCH] Added gl_PerVertex output blocks --- data/shaders/occlusionquery/mesh.frag.spv | Bin 1796 -> 1796 bytes data/shaders/occlusionquery/mesh.vert | 5 +++++ data/shaders/occlusionquery/mesh.vert.spv | Bin 3012 -> 2676 bytes data/shaders/occlusionquery/occluder.frag.spv | Bin 572 -> 572 bytes data/shaders/occlusionquery/occluder.vert | 5 +++++ data/shaders/occlusionquery/occluder.vert.spv | Bin 1720 -> 1384 bytes data/shaders/occlusionquery/simple.frag.spv | Bin 496 -> 496 bytes data/shaders/occlusionquery/simple.vert | 5 +++++ data/shaders/occlusionquery/simple.vert.spv | Bin 1584 -> 1248 bytes 9 files changed, 15 insertions(+) diff --git a/data/shaders/occlusionquery/mesh.frag.spv b/data/shaders/occlusionquery/mesh.frag.spv index 2a8f5ee782ac8940cbfebe75c04d6fa3ddeffcf4..c83e15982df00362d8e69292c8c46952d5e13337 100644 GIT binary patch delta 12 TcmZqSYvG$v!pOd{w4V(C8JGj? delta 12 TcmZqSYvG$v!pO0)w4V(C8Jz>| diff --git a/data/shaders/occlusionquery/mesh.vert b/data/shaders/occlusionquery/mesh.vert index 4757f151..0182f588 100644 --- a/data/shaders/occlusionquery/mesh.vert +++ b/data/shaders/occlusionquery/mesh.vert @@ -21,6 +21,11 @@ layout (location = 2) out float outVisible; layout (location = 3) out vec3 outViewVec; layout (location = 4) out vec3 outLightVec; +out gl_PerVertex +{ + vec4 gl_Position; +}; + void main() { outNormal = inNormal; diff --git a/data/shaders/occlusionquery/mesh.vert.spv b/data/shaders/occlusionquery/mesh.vert.spv index 90229ea971a48c80ba4109421a96f2babddb4fa8..3562c8c1a8b417a541754c8cddc07ceb9f76493a 100644 GIT binary patch literal 2676 zcmZ9MYjYG;5Qc|r5C2gIOf5W-BuDr=n*5lQ>tr&8og~MT*X;Dll_}cQYU4BUG^IBKK@qLY}h@INRAc+Zm*C8p-ouch@)R z)NG-9_F$Bob(YhO!0pw3zLyT}XXyj))Gna;g-cDdO1S`_)C>a|ZixC&xRR zyo}x-bUW#2I~`5ZUoeY!;x2vpI4ctHti5+xlQYPM)mN z&iXlR&#fX6OYHx1Wqj|J_YetQqr!e?Z&kC6obCSw#AOZI^MzHOkKWr0m*>UeynV0t z%wB8zUX5p;wawuar#v^0rLBGjZI-=>oP}>a+WMQ=M=M?YYGpg8@IQ$jebBFMu42J= zZt}zL-1HmYp6l~Y{o2k^%zU0>*JnNF_3_UUPnhU7nb+wWG%o>pYlCev{o;<{173bnlLyI7e;$ z-uV`iBoA+R{yjABi~HY4cOKgI| zzVAX?ev^G3k#Dc%+usX_cyL}tm$QHb=QVWkKZ)a+*AdT&N1kt@JCiLq=J7Tn<_hd0 zy4aB#_D+S_vku*`r|%-3m#^R1{y|)Qi-`BjF=uDJg!rDU%euAYMNJ=|KVH)cn0VxW z3B8{GWo$857V{Gr1W3IjhvB>o*`s2BN0w%siXYK6` zL@ZX|s{nzQIhOpj8g8D!U$1bvuE1}i8%Mkz=hGTqkMmiDi@74s=jg@}ug7WCaD5%B z@;lf-tZfxpLjwN-eH}3`a|rxPbno^aV~YE2e}x#!b8=$FZFIjg-;(!zjmQ;u7RM^g zS@?}_A$Ilee}nFfgMSxYOmPMOw<@P?Fk{LyCx3^; hBHnlC^?2W7iz%*%_iOdr@&lM0WBD7U{ST}w$iLQFs~rFU literal 3012 zcmZ9NeRC8=5XL9D%K=6~P$aR_w;m6_brvt$pg-f=-)vXxndo4qr%ROyPDsdt@YN_ zV7N0idu1Ar!>-~T@j2q&^m9|QzBjy+_jjXIIvhDB**@hta+cp>p5}e2;;O!eBr7P+QIC8!l0mYS#`sj+ zadGz+R`p^vuXDE7&&fK;^(w~mX1n=LoIXk7r_zn*4br6hc-YQWCH$C=!%II27je%? z;k~U~)|z`?dN=K~OOjUR>A_)PcSut>17!+i(u-+P9F^~3)4f^m}FUh z4NrRZRZc$|Klyf!JIm+5oSTzaEV%#974gXhzh@Hjs|4=3_GXwZ%bEU9NLbVWZg^Cj zx8Cy>EMmfOHypch#DwEMIuL~axI{fv3nE|uECY}1s4z`-jpP9fPjGdX_4DtDr zVdGBhU}gl4eBRQIje1Y(?=kIg;IpzYFL1^ewN%{+any&MxM2DQcS87-_PT^TE(LsA zy4CfzbbN`2{~7Id2@8MldlJr{5vB+D!jTs}wA`^F)LYli9oWeW+>pRo9uv}8_)lsl z59%}fhtfwR_MXfL7&|#!mN@t97UyTA5u04Vv)btunD?9u*zV{2yo5!3`p?Xnop)Q4 zkQ4FNgHAm2=Np4R_Mf$nNH~Wb%#6Yr-VFGvrk1$$mPL$z#4yYFk~`lw^1mU>{IS7rgua=j`2|GD1szU0CG`pzv#;A|PcD8l$6$HIT9#FMA_ ze;s&yS;l`OojCC2IL#7Yj}hFQFG}5@Ila_ayME z`l=9PBXIC6>ZB&~zb~C0oBsppa0tu%{|q@j6h}<_$cgV3oW=V=dO6;Y!f*)7;{6f6 SEkB9FhggragI~()n&e-m-Oum< diff --git a/data/shaders/occlusionquery/occluder.frag.spv b/data/shaders/occlusionquery/occluder.frag.spv index a00194c362c306db688a6e2b9ca687953084b705..2fbb54d9ba04418f22baa5c8b9a3f9253e1fcbe3 100644 GIT binary patch delta 12 TcmdnPvWI0t3M2c*)a#4@9g75O delta 12 TcmdnPvWI0t3M0qH)a#4@9gqZU diff --git a/data/shaders/occlusionquery/occluder.vert b/data/shaders/occlusionquery/occluder.vert index 2f215f25..a8232253 100644 --- a/data/shaders/occlusionquery/occluder.vert +++ b/data/shaders/occlusionquery/occluder.vert @@ -16,6 +16,11 @@ layout (binding = 0) uniform UBO layout (location = 0) out vec3 outColor; +out gl_PerVertex +{ + vec4 gl_Position; +}; + void main() { outColor = inColor; diff --git a/data/shaders/occlusionquery/occluder.vert.spv b/data/shaders/occlusionquery/occluder.vert.spv index 50f69a9b539b8707ff1eb544c5d48a81c165b099..5606e185868f415c417adecce7113f983e464b47 100644 GIT binary patch literal 1384 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