From 465c18862cc9a2719310a31898f9fdb40e3e378e Mon Sep 17 00:00:00 2001
From: Sascha Willems <webmaster@saschawillems.de>
Date: Thu, 4 Aug 2022 17:24:11 +0200
Subject: [PATCH] Clean up vertex inputs

Fixes #766
---
 data/shaders/glsl/offscreen/mirror.frag     |   3 +--
 data/shaders/glsl/offscreen/mirror.frag.spv | Bin 2376 -> 2308 bytes
 data/shaders/glsl/offscreen/mirror.vert     |   5 +----
 data/shaders/glsl/offscreen/mirror.vert.spv | Bin 1668 -> 1488 bytes
 data/shaders/hlsl/offscreen/mirror.frag     |   3 +--
 data/shaders/hlsl/offscreen/mirror.frag.spv | Bin 2904 -> 1928 bytes
 data/shaders/hlsl/offscreen/mirror.vert     |   5 +----
 data/shaders/hlsl/offscreen/mirror.vert.spv | Bin 2184 -> 1224 bytes
 8 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/data/shaders/glsl/offscreen/mirror.frag b/data/shaders/glsl/offscreen/mirror.frag
index 9c784dc2..faa75c59 100644
--- a/data/shaders/glsl/offscreen/mirror.frag
+++ b/data/shaders/glsl/offscreen/mirror.frag
@@ -2,8 +2,7 @@
 
 layout (binding = 1) uniform sampler2D samplerColor;
 
-layout (location = 0) in vec2 inUV;
-layout (location = 1) in vec4 inPos;
+layout (location = 0) in vec4 inPos;
 
 layout (location = 0) out vec4 outFragColor;
 
diff --git a/data/shaders/glsl/offscreen/mirror.frag.spv b/data/shaders/glsl/offscreen/mirror.frag.spv
index 7f382743284bce16aff225531d284ee0af59ec03..a94d88daa7c9201d2ef334733665075db63078ad 100644
GIT binary patch
delta 80
zcmX>h)FQ;o%%sfDz`)4B#lXRkGLhF*nuCFbfdPzj6EpLGOa>kxRsdqviHYZV-GNdd
X0XZOMnC#2wym<j*1=D5=76DcOnGOq4

delta 140
zcmZn>Iw8c%%%sfDz`)4B0fcE2c}?Xx8CVz?z&JNCGY`mQ-~nO<AXWw9)QPd@Wm$pJ
zsX$I<UT7GQVsHoYL5k#nm~pZtqcbl^1f&8a!mzoLv6@Lz0VtFLQUJsuKx_@=r*3}B
HEY1o5nxqjF

diff --git a/data/shaders/glsl/offscreen/mirror.vert b/data/shaders/glsl/offscreen/mirror.vert
index 738333fe..f0941fad 100644
--- a/data/shaders/glsl/offscreen/mirror.vert
+++ b/data/shaders/glsl/offscreen/mirror.vert
@@ -1,7 +1,6 @@
 #version 450
 
 layout (location = 0) in vec3 inPos;
-layout (location = 1) in vec2 inUV;
 
 layout (binding = 0) uniform UBO 
 {
@@ -10,12 +9,10 @@ layout (binding = 0) uniform UBO
 	mat4 model;
 } ubo;
 
-layout (location = 0) out vec2 outUV;
-layout (location = 1) out vec4 outPos;
+layout (location = 0) out vec4 outPos;
 
 void main() 
 {
-	outUV = inUV;
 	outPos = ubo.projection * ubo.view * ubo.model * vec4(inPos.xyz, 1.0);
 	gl_Position = outPos;		
 }
diff --git a/data/shaders/glsl/offscreen/mirror.vert.spv b/data/shaders/glsl/offscreen/mirror.vert.spv
index 16b29306c2f2d7638c626f2556fa80b36e116bf9..7a7977e36aaaab4a518cc2c0aeb75da0f486b82d 100644
GIT binary patch
literal 1488
zcmZ9K%We}v5Jd|cPar@-2zda(jANb&L@WRyA>K&NA`(UsY*9!?XwbwH*<(Pg@(b`u
zd=(oc?&;|YhOx?B_tvehuIg?!x>IJyY}!uP9jm`NYltyBWl30jTiaV3qiS#C-u=5M
zW~>>6Xl9kicU-o=lMnDu$}Y>+WKI1VT7OF1l4?>1Mq7@nemNrER86zDFJ7y15_~~B
z7?z*1-6}7&dm<GYYJbkNFT|ar&VIR<6<XQrjMnjoGSuZf`5=@LPVA=e$KriI8@|hi
zRrXa-Y|Y~nD@S=Kn%Gp(Q#0`SpxVyAW#~LcZN**|`N6AvRP79Qv!fW(A~r6HqZsF7
zK7746hjtBZQ<xt4TCz?3JMISdUrrZjXM?WJ<D8RuVDg^Hd@s2F^XOqR4@};n%=6$p
zuNUtNjvkozs*KNZr-lJ@2Y-8Pg_#oe-l)O7a5leV=cob4ES<xL<4tiEa?#D}pS2?n
z4gR9ML~ANrQU*PM$xZdoD@F_dC}Q3w+_La=jG=GG`+##}kJG|_PWAvZ6SxK88Lg>|
z{?;R&mCr{$cZilfJw7jgQoj^6^l(W&J#a?ySG1yqr#_gOdp_DLGPA>{oadUn6sV7S
z;OjE<E5bLlk^|S4$9#Qm#4zgK(#jc#Qy07zxd)mRJux>vbic&#&YtU^p66uDiCH|B
zlK#)h;9YZGJ{soXng#jrKeP`yi!$=yJ#Se)dCbl8F35-Xyo>V5g-65uc&E(njrL{+
zsm$N5bDhXBFXvVxN6&pti+OcrsSG`F?%=!jC3aOteKb!r9o`%q=ODf=gQFkb=xrIZ
PWmf3HXnyO~9?Jdzl3i1S

literal 1668
zcmZ9LTTc{05QW<v7*Ldp$VJ6<mi3OVc#Vniiplao;u-?41Yu&v3^QbRR*g^m1^r3>
zDql=IUvJmCu}N*$Id!VKx_XFe%?amDxk>#!a)UMJYGRz5a<SjrTiaW$UUk@d{A3-)
zw2QnD&5S$a{W1L>?Pmqxv}{T?BWub?iu700{!2;YZcKmw^k8zzezmi!9ZY^!c<3>;
z6z`Nh;*pyZ-g*089md`lbjRKDb9zu^rMifvLPL*Vvh*u)<LKk4JWO-#)SB1c|5*BS
z=r=3;F~YHH34hA>I%#(|?N;eGL9qiKpIF(;{GqX%@OsYld{$K3+4mHk#W-8BjXXPk
zm-VXs;vgNym@2V;o)2U6=ZCIXJItvrp9N-4V9o?HC&Qb<%z!m6+tjaN?#UYE^dY!e
z&kgdZIhqG1@3qYG;Qr6!j-z>C@=j!y2WNTh@Sbqof%jOIu?#l`&|_-Z45-H&v6uzR
zIC_I)H;yylq7e=sj&G7)sE2M|zw8ZhXz&;1#o80uk}|jhm{=k_sU0o+^MLub;fV9!
zLO&J<TaVN`CrmwhK|igXTzKk%d1JU`Vcv@v`g(X@I5TRT7p6bno*H0g47VVBL3<*j
zueE>|<g>_M)Q*;#7QZNeRDUICxI;recd$FJ1}!}2gPVb)9@^_N=T2VH&zighs6`xn
zSH^iO!uPb316P;Fd)eHGVf1}pJ3SERT=06}o@!RyiMg@R{T9P_`$8=5b5_RNyi}Ao
z1iz7jc`V78A#*~{Y?fv4rnw{^4YM-MW%=+wRfn7v8F}!Q$G1%$Gqt>{^5HEnkxwo>
z8fJS<##}$BHuJd=IBi4jX5g5m>23v%d31DhW_epiK6>K3&kxllc1M=T&@damM>zT*
Z{y+xDefVA<%9uN|LJvmsM=$zJ_80BwU0DDC

diff --git a/data/shaders/hlsl/offscreen/mirror.frag b/data/shaders/hlsl/offscreen/mirror.frag
index b9c68b7e..72a3aa73 100644
--- a/data/shaders/hlsl/offscreen/mirror.frag
+++ b/data/shaders/hlsl/offscreen/mirror.frag
@@ -5,8 +5,7 @@ SamplerState samplerColor : register(s1);
 
 struct VSOutput
 {
-[[vk::location(0)]] float2 UV : TEXCOORD0;
-[[vk::location(1)]] float4 ProjCoord : POSITION0;
+[[vk::location(0)]] float4 ProjCoord : POSITION0;
 };
 
 float4 main(VSOutput input, bool FrontFacing : SV_IsFrontFace) : SV_TARGET
diff --git a/data/shaders/hlsl/offscreen/mirror.frag.spv b/data/shaders/hlsl/offscreen/mirror.frag.spv
index 89f23ca2b62227d46b5ee16cf089779a153e130a..ff33a17b7234f326a5960aac350fda1777a5e1d7 100644
GIT binary patch
literal 1928
zcmY+E+fGwa5QdjM016h6lYoa-@Ca@c0nq{l5i3fhT7s9RhQ>6Zl$2uh4lhi66Cc25
z^Oz9)ztug>W+gv!+%x}LGbJ7yYj^I9b1vmx>My6)#k{A}wRxG}C~gD?jh$d-_8#$+
ziz9rj+jY2v^q5dBRrc@`#g`O%WD!#nX>sp+FGo_f+vIC}-Y*B!J3*yd`cRgQpWH_I
zQ{%8+Uajrc>N35*13&o(rRx4}x#d4Af9Q(jw|gFyz2IZ19uzi<>s#xauRQ;xI>4=V
z*zm#P_Pec>H~F<K-zRbEF65p&-M2+HuUm4@PN7%Gt0Q*G>j~fgigXUS^o-iv^BO@N
z;@BC1X<&1&XdK((gQ`y7v@oGu^e(}<quhY(^U~4+wTNTGi`fjx?v~^m_)e-bc8@@f
zD6BU3)5%%x1sV9Fu-rZ}oy(ft-?UqO24v%l!Z;4fe|&OsV)l@1?l7#^U|-;j%}&|D
z=A?C-i%r$%jwp+r!9N`O%^s1>cig*Qd83l#T?+kXUzW|Ak=Lg@=9iJ@sw6sZnU;hX
zoJJL6U*MVz`7l=wHawUk2OA#LhYL3SnTgr-XK%={x6eqAz8&+jw`O0GQ{NXXcT6_E
zDCSfV?(pSsmp`(`B^TA5yIvRQiOpNw5a9J%-*VTRg5`V*eYfO;3$a4DQ@5q#kD^Oc
zp~oG8drk|~B9|Tfs(QpH1ajE5-(oW<$@wQH@VP7CgFE_P$sn|mKSK^v(%Ct3_y=%b
zAjWTk-s~K)2LiDl>d&2L1mgT|eyQiIBykQLh|dZ5;eZZ@hoOx$4)lcwIrG9J!8kmY
z4hLdcftYbvkWSn<EQWCj&w)7k_~Fph6Mp}e<YV`kA$y+_*gc!!vUJ{<Q&SFeT@ko5
zGs1o%*o=tr+g=u|#;SB`kYhETN{6%6SPSFSB}NUtE9jlmlFtPCkhd)#zn{DSe>lI@
zZP<tB0)Fy2wnx0DaU_SG=e>_qiy8B#@Zo<+bUwTpHZ$ezkoFC`0AKsY_KI15QC;|~
h3mJjAQpa`?X>)%O=8Q{{&-Y8(<)kFBV=<o>{sU8Dg2w;=

literal 2904
zcmZ9N`EQg}6ox-qW(H7Mq)?%XGom7b6Jv~;G)k~Q!!Nd>wfdVGr6FV5nP!|Ccc)Pl
z_kG`R-&fp4|17tJ)aUv7o#x6--k$Tm=X~ehbC+p<-}XwDt;n)$ZT1I$9UHQ~Lg~-B
z(RJDCY$aBIw$W@E=mTb`m%w_MaSGz~=i03#m9lcS1+9Dc+;shl!}aED<H$5zy{tZc
zS9iWMJ<^_Occ8gGq;CEljoG=G>1Ey8g_Pu1^0hQu^*bA#`sDtbN5;ku?Yn%bRwZ9!
z5gQ+yI5>H5?1tr->u%3?^A9JcZkgPBXmtN1T8XaGUP~w!qfbqY&3EVKyVfp~qvp7A
zN?y*n-;H<Lw~w^jox}L{xdS`b=rm^YnVKz2l(JRX&j0BLI_*~XK;yP%>q!1xC7Zz}
z`>?!uqs;BTp8+<2QM#0`&Ha`6er&^cnCm&oU7Os#)41nw0dN?X*FfaE?`d2f@y%3U
z1+Ri#e5=12WLa;|Cioh>DzKJux$92(nQ+%QNc=3UHSA|Mw@Gea)=Uv|twU$*iQM%N
zwG@%-UNMG)pS{GF=h+BXOA%`xKtHv(xEOp>@om)Fob!Fx$2tb#YALqRfp5Y7?B6#O
zL++^3`8i8&p1YMS--G(rLYKQ&=V7g79pmR>t)niFGj|UM$f_3l`B?LU*YMqc^EQ&_
zS=UguWA(RD%e!t}bF6(4)_b5Xzog(*Y>gY{BQw`LW9D3m^_!@1b;0ey_;A6!BSXyZ
z{dd2HiMc1<ONZROu$Dt^@9x8jg4?@21-EDKRPY+U@4%d^@a)r=!@mEf+J#tayY72{
z^98>*;r4M~!p*<`H2y%s?eoFYcrW38zmRbEa7V)3Pk%dH&$X=2bGa1Qzuf)Z1?+8{
z-aMn-z#R4Kh*(d}{3`Y`;Qko1wtO$&x|WB4`Mz5<`+XRw`*yA286E}d$H<XC0(`UT
z<E++oJqpxQIH&t-Eap6hA9F@ekD;jte;nWMjxwLMp8)2lThlXAi~J|?)fS5Ur|{MM
zeTjUv$bTB&{HXs7zM8)=k*}uj`TP44eLjny{*Jg0=6NrSIY$-y9M}o|B6bq%_?MXa
z^FYnJsPFgQBY&s#y+Z@wAL1`y&C^<Y4faJ~&I$UhVqXGkp4p$|{EYnpIGoe?%Rt>)
z`p(nC#yqbSF>TEADt-^dJg?!a#XR5Re+wMWWBhfX?mYU|@~yuC$^{?7z6mNI?%iAX
zo{7J|e&aoR8>q*6-odx;b`d|0uNL|5;(K16tKYu|jstb?hT8kUy2fJe5AdDacM!Ec
z#8;2GKf>>UnEPXVwaEVjKb`wixH;-E_h<OlHRk*EeSZ#Ild&nZ8SEFp{c?|PV%K~F
zUjlXW9lk~NuYj>Z;9Ata2Hq#<m48!c=Ehx9^L}}Lo|QIw{SLpEqm<vb6ZmTGPuv?d
zzmI$4najO**3(A4AMri69_#V`{sh#bo-wubzI#`rpI`9pC-|@UzPIS_H+(hoT%R#D
h>z%~99&LR8JH9#QE@0&mtK+K~D`DlQ_z!Xo_z!n50>c0R

diff --git a/data/shaders/hlsl/offscreen/mirror.vert b/data/shaders/hlsl/offscreen/mirror.vert
index 671a3138..f7c547eb 100644
--- a/data/shaders/hlsl/offscreen/mirror.vert
+++ b/data/shaders/hlsl/offscreen/mirror.vert
@@ -3,7 +3,6 @@
 struct VSInput
 {
 [[vk::location(0)]] float3 Pos : POSITION0;
-[[vk::location(1)]] float2 UV : TEXCOORD0;
 };
 
 struct UBO
@@ -18,14 +17,12 @@ cbuffer ubo : register(b0) { UBO ubo; }
 struct VSOutput
 {
 	float4 Pos : SV_POSITION;
-[[vk::location(0)]] float2 UV : TEXCOORD0;
-[[vk::location(1)]] float4 ProjCoord : POSITION0;
+[[vk::location(0)]] float4 ProjCoord : POSITION0;
 };
 
 VSOutput main(VSInput input)
 {
 	VSOutput output = (VSOutput)0;
-	output.UV = input.UV;
 	output.ProjCoord = mul(ubo.projection, mul(ubo.view, mul(ubo.model, float4(input.Pos.xyz, 1.0))));
 	output.Pos = output.ProjCoord;
 	return output;
diff --git a/data/shaders/hlsl/offscreen/mirror.vert.spv b/data/shaders/hlsl/offscreen/mirror.vert.spv
index 6c1d5e98c607fceb0651fbc19c82d59be0ec62b2..83e55df278e131aa281f5e37beb66563fb6209d4 100644
GIT binary patch
literal 1224
zcmZvaO;1x%5QdMfZAAs-8x`v<RW>G#D`H~&+yEPk5q|(+7d65qq(I#96ZpAoOnjcp
z8PgQc&D@!J=j%OlZ@t!SrF18yG?O-Xd*)ItBlXHRI-BnOvyb+N$2v8{jJuVtrv~}}
zuu(lJjeegDdS?eEaB7le+#}SWvWflub06(<b52gnpM%5Euw+7$EOF<b4+j@!1m^6c
z^2gv8+Fo2D_ia_YhR410{nOrV|J%;qPXEhm!sN9ouI1V2R<J?DIdQiweDC(aLXN&O
z+m(0Yd+%{y4(nra{Z96`^Idei|G~_Cglsb>c47ahlbdxPC$Pyn^TzAsY~3Xiy~HN#
z#G)>~Q}Enk6Jq8pWBVr*$O;uxXnkv!c;81Ch&*0pKXw@Y!-@DbzP*jxYX(W_^1~|r
zES59u-_AP}3u$L=?yMlo9okF2@|#23vyK>_N6SrIe*taG84FY{qB|f<Xl-+r(e`xa
zTYP7@KQVoKYTH*odfGR9`Ri}O%)aJ&oO4a}3i=(j@>)gg_lZBj*^d$Dxktr3xjaFP
zMcz~F$aBY$w}x#j@}7<5x%<fTUpDp?j_&L^A{S3!1-6*{1M6f=&bu&hm+Of21!CN9
ldPQGjUBtNa0(+5hxd!$UTikoTXM65XOxt~G|AEOH<S!U&ITru`

literal 2184
zcmZvcX-`v85QYzw7FQ6F#jV^@;}T6{j4>t#H#CJ0wuMr}okFXYSZ-5WjNkYP{#?J9
z_&%p+nw#n+!_526a%Se9+the|(z!9`+>|@ef1VjP9+;HJc&FW|q1~>x4gup5A|@nh
zNyg)pxA){s>+giP?P|H->-2jv6*J*E>`MH7h&iLSjX&f4)UI^ngVi|hHe^$4R=W4I
z(=7D&VwpY{jt45OZZ62KJumw@*gPH8Y3}!0vAWJE3ZC<hTFoE$jpNLA+-QE2rj`~H
z>Q4GuTZe_Cdbdz1SJ$`J%cZ+=D{j*7Ao#Xk?yQ!}n=ghw_7eAdJ~8PekA0ahSv0L3
z(Vy)Zyd=C`T|Z=v>=4XjI|SPf(~5|MJN0h8?N4s`yrS}WSEnUBU}nyGG{C%1Ftza0
zf6`CSNk2PUmhcb{&UxhATG%x({~wOnbCNaX*}I}Y%cBSKo{n&%dBi32n2Ee&iPeG|
z&4aT%yGPb%QEwHFn0eXU{z$T*jFZw}a>48qOl(#&bLWYHM;DY2cSbU&__NZHguZVF
zJT-!+g?Y@+o~RGztQm=O$4?f8=VWmX{ct|Jgfq#8S>Pi@otLH-^U?o;G&NHa{PWWE
z1`l2gn0de#rHSQC@TGw9&#Lle>6{|2NMmOe!~LY5)!+{CKHzim-;!oW@YK8`jUNtN
z2-x!P2{VJubU$EbCVoYle4C*dFg-t#pB><*2AG+##{y<%W;D#q>=%xBX6D;4jDPU^
z=iCE%n44T4_V8QPuS%24Y_BAoZ@84egB=X~D~e}^oP_?s>|j~K*%h6|4)YRX;2+Bq
zNyA}t7I*KNV%cLw5=ppoR&PT#yv1zFCXX0ufQiA+?yC~|=bpl`|1AkT9CdjYH3_`s
z=_mf5yw~F3tsnAsB=DB^M)v4=Z^gm$ZP<D5WW$rk9e6K^B-RtV{2+nfPz?9}W8kEQ
z+^4{eCAi(d@g6GbhPzakkWc)sgzxf~>f+mz;HM|!_5;s+#x-Qavn%>8N;f6!pV`<y
zm^kx)mTi7!=e#cxc#HWOVwjy8U}A{pyJ|_Ofv*&>`K}4Wu_J0<m%#B5KOqf=pZj=2
bf}efi=i7j@{F}1zvpf75X}CYicqsV`Hx+^g