From c5e477a9d62748b4d91becdaa27297b8b5d46d77 Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Sat, 28 Mar 2020 10:44:39 +0100
Subject: [PATCH] Apply mask fixes

---
 Shaders/painter/glsl/layer_copy.frag.glsl     |  17 +----------------
 Shaders/painter/glsl/layer_view.frag.glsl     |   3 +++
 Shaders/painter/hlsl/layer_copy.frag.glsl     | Bin 1470 -> 726 bytes
 Shaders/painter/hlsl/layer_view.frag.glsl     | Bin 1498 -> 1634 bytes
 Shaders/painter/hlsl/src/layer_copy.frag.hlsl |  17 +----------------
 Shaders/painter/hlsl/src/layer_view.frag.hlsl |   3 +++
 Sources/arm/ui/UIView2D.hx                    |   3 ++-
 7 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/Shaders/painter/glsl/layer_copy.frag.glsl b/Shaders/painter/glsl/layer_copy.frag.glsl
index 5d3fdd19..b0b28b3a 100644
--- a/Shaders/painter/glsl/layer_copy.frag.glsl
+++ b/Shaders/painter/glsl/layer_copy.frag.glsl
@@ -1,23 +1,8 @@
 #version 330
 uniform sampler2D tex;
-uniform int channel;
 in vec2 texCoord;
 in vec4 color;
 out vec4 FragColor;
 void main() {
-	if (channel == 1) {
-		FragColor = textureLod(tex, texCoord, 0).rrra * color;
-	}
-	else if (channel == 2) {
-		FragColor = textureLod(tex, texCoord, 0).ggga * color;
-	}
-	else if (channel == 3) {
-		FragColor = textureLod(tex, texCoord, 0).bbba * color;
-	}
-	else if (channel == 4) {
-		FragColor = textureLod(tex, texCoord, 0).aaaa * color;
-	}
-	else {
-		FragColor = textureLod(tex, texCoord, 0).rgba * color;
-	}
+	FragColor = textureLod(tex, texCoord, 0).rgba * color;
 }
diff --git a/Shaders/painter/glsl/layer_view.frag.glsl b/Shaders/painter/glsl/layer_view.frag.glsl
index 569c48fc..e5951c65 100644
--- a/Shaders/painter/glsl/layer_view.frag.glsl
+++ b/Shaders/painter/glsl/layer_view.frag.glsl
@@ -17,6 +17,9 @@ void main() {
 	else if (channel == 4) {
 		FragColor = textureLod(tex, texCoord, 0).aaaa * color;
 	}
+	else if (channel == 5) {
+		FragColor = textureLod(tex, texCoord, 0).rgba * color;
+	}
 	else {
 		vec4 tex_sample = textureLod(tex, texCoord, 0).rgba;
 		tex_sample.rgb *= tex_sample.a;
diff --git a/Shaders/painter/hlsl/layer_copy.frag.glsl b/Shaders/painter/hlsl/layer_copy.frag.glsl
index 8ec76148fd3d09406886d5976d3808d00112f29c..e732fbcf778890d9dde5e88e8a0967e53dff4262 100644
GIT binary patch
delta 264
zcmdnTeT}uAfhoQuwIaSaF}ENmwTOWM$YEe$aEWko4!$s9(@kez6Wdyj|JNs!1uz1|
z4=^z>umWilApQcx4nV;YAXWj22f4Vq?Es3w08og*2E<|g|DOS<rWeQzaxpXniAeyl
z0uXCVoXyW#17t8y4rCSP1gZjq&WWex1yI}tbk^jljGD}=SFfJDkFiBy1yEf85NiQ(
u76$|4<Rm7K$-7uWRD(ktL#6-)nSmH)95Ndy3{+jnD$fWaeJ3}tasdE=?llzv

literal 1470
zcmcIkziSg=7=F)7wU%N+q0mXcp+f{Irie%>#Wt5~gw~Y1ONlP=QcshTCLy_@f=CxP
zb#n9{kfTE<ol9{R2XSyKI7=oc<MZD4edP@P$dZ>l`QGon_xE!Nnbk1ZulD@CPBZ8d
z;X*XO-fY+WW{=3&sr#)~&?J@=U>H_qEq}bQ?Re?h(etIJKTl3iKN)!PVuA=Cy1_aO
zUx4XzMBfqSSOt3vclLV^n7}eX6N3R8vw&mea%`Ie1ds*hfoXu{4Zv~3!Z}&q0w@>v
zz?}{tIO3X|<B%_Z5FP*99(WCBTZkf#WxtO=CXwTZ(zzbjPN`(Nwm$V18?7+*G~#S3
zc=$k$&Bji*-D^JzMb^10iW}~RaO?iVpeyq2y-ov6iQM&t9Nlr(?^<z2qDh>$61nuQ
z(rIbebF!Uv6N*=;<Vz*Tq9}?=$aPIU<6HvJa+V7Qcf0EO-N!+QAh%eke8u2fu)hO#
zC&{>nHQ28NZnDmOrtN{;T4fF|QAg_KGEpr<W<MkEtS>_6-U7t*g|yePTDA#{IHR^d
zb%2`^<F>4Gg;M5}dR`=Yc}#SWFVE7Vve_#4hbJ<x?up}Bu)7Po=J}NLu`kPW1tn$x
z@sA#u|51DRyg!~En5R*D_!f?*2mUSmtq0AY=HlikTxkA=xJYu`*FK74``Q0zvoA@X
oB*(MhI0@$6^;W&tm`MQq9<uPB`M-{5Ww{7wJvIz|vF|wK7XiAGlK=n!

diff --git a/Shaders/painter/hlsl/layer_view.frag.glsl b/Shaders/painter/hlsl/layer_view.frag.glsl
index 8d63714a5c90f2699e4600e5a315cb7d23f62807..00707559785e0067afde214717b38e6b44d38330 100644
GIT binary patch
delta 145
zcmcb`{fK9RnQqZe+u2Xv#hCBTEnV>^|Hwi{1_lNLHU<V(AZ-G~JwSmQK+MC$z%XTF
z@_k0m24)6^0HDl+&E8D;Oq2DPWf)l}pJ$eye2hhBG9NR?WHDBe$=g_3CY!Me$Z7x;
hf{X+Kpgsn6AO;x?0^F19S>+koCQoGboV<XQ4*(wcAU*&9

delta 134
zcmaFFbBlX|nXcjF#jCD&%d++?s?iX7STmQAfq`KKD+2=%F_-{x4^ZF+5c4nr@y6u)
zjGRA!tN@_QzRliD`An1TSQ~Wh7#J9XLmWe<0EHES7-R?tFat3g5VL?dK)?yaERzM<
Nq#0R(WZ)z=HULVj7)byC

diff --git a/Shaders/painter/hlsl/src/layer_copy.frag.hlsl b/Shaders/painter/hlsl/src/layer_copy.frag.hlsl
index 67b90127..6a653ae3 100644
--- a/Shaders/painter/hlsl/src/layer_copy.frag.hlsl
+++ b/Shaders/painter/hlsl/src/layer_copy.frag.hlsl
@@ -1,20 +1,5 @@
 Texture2D<float4> tex;
 SamplerState _tex_sampler;
-uniform int channel;
 float4 main(float4 color : TEXCOORD0, float2 texCoord : TEXCOORD1) : SV_Target0 {
-	if (channel == 1) {
-		return tex.SampleLevel(_tex_sampler, texCoord, 0).rrra * color;
-	}
-	else if (channel == 2) {
-		return tex.SampleLevel(_tex_sampler, texCoord, 0).ggga * color;
-	}
-	else if (channel == 3) {
-		return tex.SampleLevel(_tex_sampler, texCoord, 0).bbba * color;
-	}
-	else if (channel == 4) {
-		return tex.SampleLevel(_tex_sampler, texCoord, 0).aaaa * color;
-	}
-	else {
-		return tex.SampleLevel(_tex_sampler, texCoord, 0).rgba * color;
-	}
+	return tex.SampleLevel(_tex_sampler, texCoord, 0).rgba * color;
 }
diff --git a/Shaders/painter/hlsl/src/layer_view.frag.hlsl b/Shaders/painter/hlsl/src/layer_view.frag.hlsl
index 34b19d06..419fdfbe 100644
--- a/Shaders/painter/hlsl/src/layer_view.frag.hlsl
+++ b/Shaders/painter/hlsl/src/layer_view.frag.hlsl
@@ -14,6 +14,9 @@ float4 main(float4 color : TEXCOORD0, float2 texCoord : TEXCOORD1) : SV_Target0
 	else if (channel == 4) {
 		return tex.SampleLevel(_tex_sampler, texCoord, 0).aaaa * color;
 	}
+	else if (channel == 5) {
+		return tex.SampleLevel(_tex_sampler, texCoord, 0).rgba * color;
+	}
 	else {
 		float4 sample = tex.SampleLevel(_tex_sampler, texCoord, 0).rgba;
 		sample.rgb *= sample.a;
diff --git a/Sources/arm/ui/UIView2D.hx b/Sources/arm/ui/UIView2D.hx
index 378016ee..8a965366 100644
--- a/Sources/arm/ui/UIView2D.hx
+++ b/Sources/arm/ui/UIView2D.hx
@@ -112,11 +112,12 @@ class UIView2D {
 										    layer.texpaint_pack;
 
 				channel =
-					Context.layerIsMask ? 1 :
+					Context.layerIsMask     ? 1 :
 					texType == TexOcclusion ? 1 :
 					texType == TexRoughness ? 2 :
 					texType == TexMetallic  ? 3 :
 					texType == TexOpacity   ? 4 :
+					texType == TexNormal    ? 5 :
 											  0;
 			}
 			else { // View2DAsset