From 5dd928b7f4451cb3a7dade4471ea6915f4ce7976 Mon Sep 17 00:00:00 2001
From: saschawillems <webmaster@saschawillems.de>
Date: Tue, 30 Aug 2016 20:45:23 +0200
Subject: [PATCH] (flat) int for samplerindex

---
 data/shaders/texturemipmapgen/texture.frag    |   5 ++---
 .../shaders/texturemipmapgen/texture.frag.spv | Bin 1140 -> 1068 bytes
 data/shaders/texturemipmapgen/texture.vert    |   4 ++--
 .../shaders/texturemipmapgen/texture.vert.spv | Bin 2020 -> 2064 bytes
 texturemipmapgen/texturemipmapgen.cpp         |   2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/data/shaders/texturemipmapgen/texture.frag b/data/shaders/texturemipmapgen/texture.frag
index 0d24666a..32f214b4 100644
--- a/data/shaders/texturemipmapgen/texture.frag
+++ b/data/shaders/texturemipmapgen/texture.frag
@@ -8,12 +8,11 @@ layout (set = 0, binding = 2) uniform sampler samplers[3];
 
 layout (location = 0) in vec2 inUV;
 layout (location = 1) in float inLodBias;
-layout (location = 2) in float inSamplerIndex;
+layout (location = 2) flat in int inSamplerIndex;
 
 layout (location = 0) out vec4 outFragColor;
 
 void main() 
 {
-	highp int samplerIndex = int(inSamplerIndex);
-	outFragColor = texture(sampler2D(textureColor, samplers[samplerIndex]), inUV, inLodBias);
+	outFragColor = texture(sampler2D(textureColor, samplers[inSamplerIndex]), inUV, inLodBias);
 }
\ No newline at end of file
diff --git a/data/shaders/texturemipmapgen/texture.frag.spv b/data/shaders/texturemipmapgen/texture.frag.spv
index b6238f312980fdc6bcb5437c0f731db3ff057224..5374f4bb15e2a43b4761b6d57a96d361555f66a3 100644
GIT binary patch
literal 1068
zcmY+C+iMe15XPrXHuj>u*qgm*H&&m7QlyGdDzt(@$dkqTxSTeJbT!=#yBp}==U?TE
z(C@bwSSL(ozM1dL%$c*D`J*RhbNVgVTdQQ<=7r6ctykK?@M?IR7o+3T4<|5ItWy%<
ztlFY=Wzl;VCnOf7+tNenYw4Q!<kd)CN7c>#=x|re!7#e`ei`L{>M~dOD8F+fpGE1-
zFMnI)|8tazlW{b0$#~|*K01AWGIh7VEl{O)|3GsyLpm$IW^Vi?ourwdcs+Y6Tlj}!
zmibmZunom?cR!u@OkFE3cZid#D*7!M`3K_N@?LTB<GSJn<sIW>n2s)E$KgSFGqYC^
zBw+fo3#7q)`Rou(|8^cso?Q*JGiF&S{ch<~yUJDbw0ltpOzjP^;PuPRS7)~6_Y@1I
zJL=85fZ1WF{{>lInD|+Z*(b4GZFWf(KK0wuU}`Ma3Aoe%vjb#L6LFU<#aCrRDe|ty
zYx3!JAiORMml$=Q%Ob?73uadc^)_WgDYL-es(s?{!R)fhzmSj6V_#kOWto}1yp-jh
z?2lT_PKi?s%s1ZD>eoJJ$b)$c@*nl(P=_5O-0!a<f$X`W^n4~|M_}gNkuvLrSj@RA
z<*vlxF!P?2__a99ejud|aX8ExN|_VPY)4Y&`l%P@jo(N)7fP9x{AW$bo0I#e=qKqT
D-xN!=

literal 1140
zcmY+CZA;uh6op53v(;*~zSq}gwXK36QmhDKK?N6KKPlReVRVOW+BI2{EcpBStNKOg
zc_zCwPPp7T=bpK9@14}fcitE?rf<URnR3mUabaVoOvC$D`?h_M7oCHnZ-*#mOw9|?
z%$iA4m&cxLoDi6jy_fCCKKp&m$90iT)|B0tKRR63*;YF`zqyEV*SDE1T$KN`9hXJv
z!!P$(<gYaf#Ys2n*`zzLT^AjFJ?z`Z-zHF|>ivQ0p3oh+ed_mIcAa$Gv!HYhUt65q
zzKXz8Z#pQhGTXgOducY(FKAP^=VFk#3Lls?@x%P8lH7IQZ=BrSmpJgf$4NWwT*MYp
zOB!agC1VC)?gg{J+_&w~f7}#i*2KBD8V3^}<zwd6e9Rxr`30%aHT^4;XO@(+Aug1m
z359tl41QVKNza$Dx7wqFJCznpPjD;3GxEfE4|2`Q^S8jG2h%g$s+4o`=s90qBTSC@
zVE`>Tz|4uYrjC~6>0?<wl(F`Qctv~e+7SLAj~0%+tMV*(@`9Nsi}*&l^=H<V<)bh)
z&}UPgx|t_h-egP$PcATT0S9JIyao7Je+%cB5sUi%iV5V=GJF1C{FyNKOv{*aBFwwI
z8*<-u8Z8(t^)1Sn4;byb49&T2pr=h4eZr$*Cj2At_tMa3C?gL%8v6PqqbD#meUZ`A
Y4^_(h?#e<LI{G9|eY`iZ7qKU@e*hX%<^TWy

diff --git a/data/shaders/texturemipmapgen/texture.vert b/data/shaders/texturemipmapgen/texture.vert
index 277dec0a..955ee136 100644
--- a/data/shaders/texturemipmapgen/texture.vert
+++ b/data/shaders/texturemipmapgen/texture.vert
@@ -13,12 +13,12 @@ layout (binding = 0) uniform UBO
 	mat4 view;
 	mat4 model;
 	float lodBias;
-	float samplerIndex;
+	int samplerIndex;
 } ubo;
 
 layout (location = 0) out vec2 outUV;
 layout (location = 1) out float outLodBias;
-layout (location = 2) out float outSamplerIndex;
+layout (location = 2) flat out int outSamplerIndex;
 
 out gl_PerVertex 
 {
diff --git a/data/shaders/texturemipmapgen/texture.vert.spv b/data/shaders/texturemipmapgen/texture.vert.spv
index eb85901a4febede6a394917dd08d391b86ad89a8..74cbb77408aacde33a45c23239815a0595d1859a 100644
GIT binary patch
literal 2064
zcmZ9N*-}$M5QYax0*Zo&EN++(#RWw~Hbs`?CRmkHl!Dt+2XZPNO>$C6P%pXh0rZJ1
z%ZKvDD*taXqrpjay8rIKdwQlPFwmbLG^S6VAyYKnHD>ySjTtr>t4rnm@<O{)Sy*0K
zgfU_UED_GAxnS*-zUyJ!0GyKyOC}^a$vw%Mq#zm4r(gPql2c-q%0c06F=$84uoZTq
zp#3haM6Dn>dLJEk+GjZm#f@rE3meswuo?x+ON-6$_=8ESQt$p?dPq(>2Zz#N`iUDB
z3a4#vikFj0F%Gp)T76v==b-pnr_NYg&@@{Koy3VwmJtgM=l&Q+pNM-OXR0TasMh1-
zmTGQ;j2X1K^w|#U&05rY*{DRH1?}F~rB99$*%^Ch>TSQ5hJQ|+YAx7{T8B}q)6Jz<
z{48QgJGRYo9`2pR`MLkNp|HhiJBzsSDrwb2S~ewjXEOjTFn0##ykO?(@vbm;!AeVZ
z_3d%qde8dw$jl|n>*i6jHxEqSj>Ol(_kSMu+?xj`?^NRR@cql{_QfpVeV2G1v%vRL
zQgZVrm$NdDSqaPITo+m{_K1sNb1&pl+s}jhV^JHQugxra@44VG@o}-xIpxqZ_N1(g
zbXGE@-Z&eWSXOvQ8ZQ0~hk5__h@Y44llVB8-tf&UPOXa)u?rKzoGS~|A`Tw42!G1X
zk=o?3A9Lkx;G@4uX=2>(w7#dL@qwv7EuEFH|BSlg-N5leZkLlX*JN`}IP3*xHu&fb
z-VKRA>rEG<2EAro3?BL5ob&noSz&sEpO>aK{25i9lcslKccs|}AGN^z#_;)C_hqx-
zKai#t=koDKvio}Q6WLu(%B;wyZ-16m*>Lf*A9&6As0a6%#F*1<_S=?4F8z9bK{hp3
z^)A_mbF$$5l84{Yro6lj{*v=9wiM<4fD2+U-!Tb3-T{2}zAVB2MI7+B^YNB^-WAzC
zkGf!Z#F-Vp1LnyLecfBm51)4hhM$+dE%Coi_{`~!^TW?M44?a-m%wK(@R`L!34YI6
zkPU~~c+O+l_`j(RIsD@z55Lb_l1&~n^m$KZ<M(;XvdP5{hgq&mnByDO=H8w=pVVL9
zhVwBy&wJr~%yCZ>W6qlr^5GNbJ$zMNVp|gSheOZ2j~xkbmiyqo!0>+Sm8?tt0HXVb
A`v3p{

literal 2020
zcmZ9NTT>H35QPUw0*Zo&T)bfdiWd|S0a4`o60AxoO2KPtAzQebWK&5{A9?Wy=r6J?
zf0Qp)dA`XuE>5a5ea@Vo>FJ(8Pxn->b6xuMxeeDDL#|ucxqg@PbFs8rnr*c!vkQxJ
zC<a`Q7or(-7rdX*cP)tOfOE2b*@!GJo0cug)@42VbZh>p;Ea^TQhD>;R=E{6f@aVT
z%dPi8C2W@CgAd_hyLDEhrKo;Xt_Jm^<KQSPFU-$1g2Rt4tDVy4gUKO2Ztv}D29r-z
z_fR<NbJKb$u53kt&dDmTacTCp-ssjj?+dy{GbWQL*3EKKq2b=2qVO~8#&M@wTnVcw
zjw)4?19Gm{$C76&s5Po#^HsePei8I%U(<Yi5X;Z`nkl#4v<&{XG)L9)PT1TJo9#|4
zxxzD8i(8RTmith52KT4_QC-U(XMHcC`s=t^3rN`&lbTHcG{Dph%zeT1)9|)1wP0jr
z+xj*<<=L~G9+|u3b)7i&OvizV+mP8_aR0|q=X4yHxD%Ph!TpQt<V7#g{g9cCUcmj5
z6_frG%U$Wmq>N#>(19N3<x>mv>}NfoW(@X&v;C-ly0-ilEPhxjbOptbC;q6soaVf2
zO!;shFl%|?KFw(1R}##dhhzP`<}R77gUJnUM(gZ#Q6}}~i0}X&P=j^wphxf--#hju
zj`Qdx?*WedMm4iWO~>^;rWp=Ap)7bCaAs&R_P(l_d!b=(F!hHcx9ghovMw39fp5s{
zt~ceQP3M+R)=gg!?&Q+x3%POjokT~kI2$~ja29)4n1TMDX3pXswmu_2o!jG6O~yTy
zPhOVmLZXG|JTPy=;?X{nId`(od8_h>C12C?cF-^B-H{9TVxapihTq4kSbEQ2XZpUT
zRo(}9QwsVwB!i>R=sEkc4F0P$;NgVhtytU@`4-2%V05h03*I&Tqer&yt%OI<y8)Yi
zQa<{E%=A<8;nC+cgV9s}`!e+O1wFlZAcHr}L-}avjcFdqhySj9h?$iU2XArwgCmX}
zTHF))@D?{OpICS_^m0i?AKxZ*TTVDlr`+>|qj#ozk#O{JM;+_***W6Tv(9_?rhQp^
bDdYSV89DPl)@0K%>OsB0=>F)HEX)1^*Rh1w

diff --git a/texturemipmapgen/texturemipmapgen.cpp b/texturemipmapgen/texturemipmapgen.cpp
index 01388703..adefc2c6 100644
--- a/texturemipmapgen/texturemipmapgen.cpp
+++ b/texturemipmapgen/texturemipmapgen.cpp
@@ -67,7 +67,7 @@ public:
 		glm::mat4 view;
 		glm::mat4 model;
 		float lodBias = 0.0f;
-		float samplerIndex = 2.0f;
+		uint32_t samplerIndex = 2;
 	} uboVS;
 
 	struct {