From 4b2a14167eb95eef34678a6d242759d60a9055cb Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Sat, 3 Oct 2020 22:29:02 +0100
Subject: [PATCH] Wii U shader fixes

I don't know what bugs, if any, these fix
---
 .../Rendering/WiiUShaders/glyph.gsh.h         |   2 +-
 .../Rendering/WiiUShaders/pos_col_shader.gsh  | Bin 0 -> 1386 bytes
 .../WiiUShaders/pos_col_shader.gsh.h          |  22 ++++++++++++++++++
 .../WiiUShaders/shader sources/glyph.gsh      | Bin 1812 -> 1812 bytes
 .../WiiUShaders/shader sources/texture.gsh    | Bin 1696 -> 1696 bytes
 .../WiiUShaders/shader sources/texture.vsh    |   2 +-
 .../shader sources/texture_colour_key.frag    |   4 ++--
 .../shader sources/texture_colour_key.gsh     | Bin 1824 -> 1824 bytes
 .../Rendering/WiiUShaders/texture.gsh.h       |   2 +-
 .../WiiUShaders/texture_colour_key.gsh.h      |   2 +-
 10 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 src/Backends/Rendering/WiiUShaders/pos_col_shader.gsh
 create mode 100644 src/Backends/Rendering/WiiUShaders/pos_col_shader.gsh.h

diff --git a/src/Backends/Rendering/WiiUShaders/glyph.gsh.h b/src/Backends/Rendering/WiiUShaders/glyph.gsh.h
index 24e8271a..3d4c93c6 100644
--- a/src/Backends/Rendering/WiiUShaders/glyph.gsh.h
+++ b/src/Backends/Rendering/WiiUShaders/glyph.gsh.h
@@ -4,7 +4,7 @@
 0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,
 0,0,0,255,0,0,0,0,0,0,0,14,0,0,0,16,0,0,1,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,208,96,1,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,2,208,96,1,92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,202,112,1,124,0,0,0,9,0,0,0,1,
-0,0,0,4,255,255,255,255,202,112,1,144,0,0,0,9,0,0,0,1,0,0,0,0,255,255,255,255,202,112,1,176,0,0,0,9,0,0,0,0,0,0,0,1,202,112,1,204,0,0,0,11,0,0,0,0,0,0,0,0,118,101,114,116,
+0,0,0,4,255,255,255,255,202,112,1,144,0,0,0,9,0,0,0,1,0,0,0,0,255,255,255,255,202,112,1,176,0,0,0,9,0,0,0,0,0,0,0,1,202,112,1,204,0,0,0,9,0,0,0,0,0,0,0,0,118,101,114,116,
 101,120,95,116,114,97,110,115,102,111,114,109,0,0,0,0,116,101,120,116,117,114,101,95,99,111,111,114,100,105,110,97,116,101,95,116,114,97,110,115,102,111,114,109,0,0,0,0,105,110,112,117,116,95,116,101,120,116,117,114,101,95,99,111,
 111,114,100,105,110,97,116,101,115,0,0,0,105,110,112,117,116,95,118,101,114,116,101,120,95,99,111,111,114,100,105,110,97,116,101,115,0,0,0,0,208,96,0,232,208,96,1,8,202,112,1,52,202,112,1,72,202,112,1,92,202,112,1,108,
 125,66,76,75,0,0,0,40,0,0,0,0,0,0,1,232,208,96,0,0,0,0,0,108,208,96,1,124,0,0,0,0,0,0,0,6,208,96,1,232,66,76,75,123,0,0,0,32,0,0,0,1,0,0,0,0,0,0,0,5,0,0,1,80,
diff --git a/src/Backends/Rendering/WiiUShaders/pos_col_shader.gsh b/src/Backends/Rendering/WiiUShaders/pos_col_shader.gsh
new file mode 100644
index 0000000000000000000000000000000000000000..e1c4694b3c0e61fdd9b43842f5253339ed5cfafa
GIT binary patch
literal 1386
zcmZ=yt1x0<U{C;Jb|7X1VkRgJq!<{Se7viHlmZZg<UoKK$eaaXf=EUn9}XD*|NqYb
z!~_9I2T;);AO*4y1YqVvc=RXvfL02S=?ta|35+JhI{8!qV+c?!H%vW{AA`haOmxoA
z$uBKpNDRm?&Me8y&tm|Z&H+?q0>m!0z$gK#)_~|{OuLW(W(fh+fJ_AeW*|EaOU$uC
zeTNj%4V*R#j0_!Y3{w~mFaT)<5wHm(fWQ(yY{2jVrT~-_$pj1#Sa<<x7<0e^h#zP(
z$PplS0s-ajK}}B#FQDlOnC2K>K<r=uv$2F1u*3k{4=(|L>1PT|&q$-Ogbyroz$F|2
De)CrP

literal 0
HcmV?d00001

diff --git a/src/Backends/Rendering/WiiUShaders/pos_col_shader.gsh.h b/src/Backends/Rendering/WiiUShaders/pos_col_shader.gsh.h
new file mode 100644
index 00000000..a67f58a8
--- /dev/null
+++ b/src/Backends/Rendering/WiiUShaders/pos_col_shader.gsh.h
@@ -0,0 +1,22 @@
+71,102,120,50,0,0,0,32,0,0,0,7,0,0,0,1,0,0,0,2,0,0,0,1,0,0,0,0,0,0,0,0,66,76,75,123,0,0,0,32,0,0,0,1,0,0,0,0,0,0,0,3,0,0,1,154,0,0,0,0,0,0,0,0,
+0,0,1,3,0,0,0,0,0,0,0,0,0,0,0,1,255,255,255,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0,0,0,0,255,255,255,252,
+0,0,0,2,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,14,0,0,0,16,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,2,208,96,1,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,202,112,1,84,0,0,0,11,0,0,0,0,
+0,0,0,0,202,112,1,92,0,0,0,11,0,0,0,0,0,0,0,1,97,67,111,108,111,117,114,0,97,80,111,115,105,116,105,111,110,0,208,96,1,8,202,112,1,52,202,112,1,68,125,66,76,75,0,0,0,40,0,0,0,0,0,0,
+1,102,208,96,0,0,0,0,0,18,208,96,1,84,0,0,0,0,0,0,0,3,208,96,1,102,66,76,75,123,0,0,0,32,0,0,0,1,0,0,0,0,0,0,0,5,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
+128,9,60,32,1,0,136,6,0,148,0,192,0,0,136,6,32,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,66,76,75,123,0,0,
+0,32,0,0,0,1,0,0,0,0,0,0,0,6,0,0,1,16,0,0,0,2,0,0,0,0,0,0,0,1,0,0,0,2,20,0,0,1,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,1,0,0,0,16,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,125,66,76,75,0,0,0,40,0,0,0,0,0,0,0,232,208,96,0,0,0,0,0,0,208,96,0,232,0,0,0,0,0,0,0,0,208,96,0,232,66,76,75,123,0,0,0,32,0,0,0,1,0,0,0,0,0,0,0,7,0,0,
+1,0,0,0,0,3,0,0,0,0,0,0,0,0,136,6,32,148,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,66,76,75,123,0,0,0,32,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,2,0,0,0,0
diff --git a/src/Backends/Rendering/WiiUShaders/shader sources/glyph.gsh b/src/Backends/Rendering/WiiUShaders/shader sources/glyph.gsh
index a2837333b6f6fd3ebf6f68c1391672623e90d04e..211a69f71e6ba98d5c9ba28fac2a339661bc59e0 100644
GIT binary patch
delta 14
VcmbQjH-&G*W=2NN&081~SOFyM1b_el

delta 14
VcmbQjH-&G*W=2Nt&081~SOFyY1cCqn

diff --git a/src/Backends/Rendering/WiiUShaders/shader sources/texture.gsh b/src/Backends/Rendering/WiiUShaders/shader sources/texture.gsh
index 573bc78615496af1e11d55bcf748881bfef848ce..8a8cf1560fa2713c19c812c993502adbf3a26615 100644
GIT binary patch
delta 14
WcmZ3$yMTAYW=2NN&084XumAujBn2S=

delta 14
WcmZ3$yMTAYW=2Nt&084XumAujFa;w3

diff --git a/src/Backends/Rendering/WiiUShaders/shader sources/texture.vsh b/src/Backends/Rendering/WiiUShaders/shader sources/texture.vsh
index ce7e2ba0..c6a37838 100644
--- a/src/Backends/Rendering/WiiUShaders/shader sources/texture.vsh	
+++ b/src/Backends/Rendering/WiiUShaders/shader sources/texture.vsh	
@@ -15,7 +15,7 @@
 ; $ATTRIB_VARS[0].type = "vec2"
 ; $ATTRIB_VARS[0].location = 1
 ; $ATTRIB_VARS[1].name = "input_vertex_coordinates"
-; $ATTRIB_VARS[1].type = "vec4"
+; $ATTRIB_VARS[1].type = "vec2"
 ; $ATTRIB_VARS[1].location = 0
 
 ; $NUM_SPI_VS_OUT_ID = 1
diff --git a/src/Backends/Rendering/WiiUShaders/shader sources/texture_colour_key.frag b/src/Backends/Rendering/WiiUShaders/shader sources/texture_colour_key.frag
index c19834ba..a1eb7c50 100644
--- a/src/Backends/Rendering/WiiUShaders/shader sources/texture_colour_key.frag	
+++ b/src/Backends/Rendering/WiiUShaders/shader sources/texture_colour_key.frag	
@@ -6,8 +6,8 @@ void main()
 {
 	vec4 colour = texture(tex, texture_coordinates);
 
-	if (colour.r + colour.g + colour. b == 0.0)
+	if (colour.r + colour.g + colour. b == 0.0f)
 		discard;
 
 	fragment = colour;
-}
\ No newline at end of file
+}
diff --git a/src/Backends/Rendering/WiiUShaders/shader sources/texture_colour_key.gsh b/src/Backends/Rendering/WiiUShaders/shader sources/texture_colour_key.gsh
index c5e11a45a81b03ffb8ec1067ffbe6fcdcdda6ac0..a7a1ffb503894485f38ca88a295eadf99ade5220 100644
GIT binary patch
delta 14
VcmZ3$w}5ZMW=2NN&083ASOF$I1f&1}

delta 14
VcmZ3$w}5ZMW=2Nt&083ASOF$U1f~E0

diff --git a/src/Backends/Rendering/WiiUShaders/texture.gsh.h b/src/Backends/Rendering/WiiUShaders/texture.gsh.h
index 12f9ad9d..f42b9d5a 100644
--- a/src/Backends/Rendering/WiiUShaders/texture.gsh.h
+++ b/src/Backends/Rendering/WiiUShaders/texture.gsh.h
@@ -4,7 +4,7 @@
 0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,
 0,0,0,255,0,0,0,0,0,0,0,14,0,0,0,16,0,0,1,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,208,96,1,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,2,208,96,1,92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,202,112,1,124,0,0,0,9,0,0,0,1,
-0,0,0,4,255,255,255,255,202,112,1,144,0,0,0,9,0,0,0,1,0,0,0,0,255,255,255,255,202,112,1,176,0,0,0,9,0,0,0,0,0,0,0,1,202,112,1,204,0,0,0,11,0,0,0,0,0,0,0,0,118,101,114,116,
+0,0,0,4,255,255,255,255,202,112,1,144,0,0,0,9,0,0,0,1,0,0,0,0,255,255,255,255,202,112,1,176,0,0,0,9,0,0,0,0,0,0,0,1,202,112,1,204,0,0,0,9,0,0,0,0,0,0,0,0,118,101,114,116,
 101,120,95,116,114,97,110,115,102,111,114,109,0,0,0,0,116,101,120,116,117,114,101,95,99,111,111,114,100,105,110,97,116,101,95,116,114,97,110,115,102,111,114,109,0,0,0,0,105,110,112,117,116,95,116,101,120,116,117,114,101,95,99,111,
 111,114,100,105,110,97,116,101,115,0,0,0,105,110,112,117,116,95,118,101,114,116,101,120,95,99,111,111,114,100,105,110,97,116,101,115,0,0,0,0,208,96,0,232,208,96,1,8,202,112,1,52,202,112,1,72,202,112,1,92,202,112,1,108,
 125,66,76,75,0,0,0,40,0,0,0,0,0,0,1,232,208,96,0,0,0,0,0,108,208,96,1,124,0,0,0,0,0,0,0,6,208,96,1,232,66,76,75,123,0,0,0,32,0,0,0,1,0,0,0,0,0,0,0,5,0,0,1,80,
diff --git a/src/Backends/Rendering/WiiUShaders/texture_colour_key.gsh.h b/src/Backends/Rendering/WiiUShaders/texture_colour_key.gsh.h
index 79c86aa4..f8865258 100644
--- a/src/Backends/Rendering/WiiUShaders/texture_colour_key.gsh.h
+++ b/src/Backends/Rendering/WiiUShaders/texture_colour_key.gsh.h
@@ -4,7 +4,7 @@
 0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,
 0,0,0,255,0,0,0,0,0,0,0,14,0,0,0,16,0,0,1,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,208,96,1,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,2,208,96,1,92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,202,112,1,124,0,0,0,9,0,0,0,1,
-0,0,0,4,255,255,255,255,202,112,1,144,0,0,0,9,0,0,0,1,0,0,0,0,255,255,255,255,202,112,1,176,0,0,0,9,0,0,0,0,0,0,0,1,202,112,1,204,0,0,0,11,0,0,0,0,0,0,0,0,118,101,114,116,
+0,0,0,4,255,255,255,255,202,112,1,144,0,0,0,9,0,0,0,1,0,0,0,0,255,255,255,255,202,112,1,176,0,0,0,9,0,0,0,0,0,0,0,1,202,112,1,204,0,0,0,9,0,0,0,0,0,0,0,0,118,101,114,116,
 101,120,95,116,114,97,110,115,102,111,114,109,0,0,0,0,116,101,120,116,117,114,101,95,99,111,111,114,100,105,110,97,116,101,95,116,114,97,110,115,102,111,114,109,0,0,0,0,105,110,112,117,116,95,116,101,120,116,117,114,101,95,99,111,
 111,114,100,105,110,97,116,101,115,0,0,0,105,110,112,117,116,95,118,101,114,116,101,120,95,99,111,111,114,100,105,110,97,116,101,115,0,0,0,0,208,96,0,232,208,96,1,8,202,112,1,52,202,112,1,72,202,112,1,92,202,112,1,108,
 125,66,76,75,0,0,0,40,0,0,0,0,0,0,1,232,208,96,0,0,0,0,0,108,208,96,1,124,0,0,0,0,0,0,0,6,208,96,1,232,66,76,75,123,0,0,0,32,0,0,0,1,0,0,0,0,0,0,0,5,0,0,1,80,