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 00000000..e1c4694b Binary files /dev/null and b/src/Backends/Rendering/WiiUShaders/pos_col_shader.gsh differ 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 a2837333..211a69f7 100644 Binary files a/src/Backends/Rendering/WiiUShaders/shader sources/glyph.gsh and b/src/Backends/Rendering/WiiUShaders/shader sources/glyph.gsh differ diff --git a/src/Backends/Rendering/WiiUShaders/shader sources/texture.gsh b/src/Backends/Rendering/WiiUShaders/shader sources/texture.gsh index 573bc786..8a8cf156 100644 Binary files a/src/Backends/Rendering/WiiUShaders/shader sources/texture.gsh and b/src/Backends/Rendering/WiiUShaders/shader sources/texture.gsh differ 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 c5e11a45..a7a1ffb5 100644 Binary files a/src/Backends/Rendering/WiiUShaders/shader sources/texture_colour_key.gsh and b/src/Backends/Rendering/WiiUShaders/shader sources/texture_colour_key.gsh differ 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,