From 077f4f8f278b97f1639086a586df402b791a0867 Mon Sep 17 00:00:00 2001 From: Crementif <26669564+Crementif@users.noreply.github.com> Date: Fri, 29 Nov 2019 00:51:00 +0100 Subject: [PATCH] Fix shader errors and shader cleanup Since I wanted to make sure that I didn't broke the shaders after converting the shaders to Vulkan, we need to check if all the shaders weren't broken. Since we're talking about like 400 shaders checking all of them is pretty much impossible and even then, So, the obvious solution was to automate the checking. Not as simple as you'd think, because in 300 of our shaders we use preset variables which without replacing the value like Cemu does, will make the shader error regardless. So I also implemented some functionality that would read the preset values and types out of the rules.txt file and replace them in the shaders using that information. And then we use Khronos' glslang to compile the shaders, using both OpenGL and Vulkan. The result was that glslang found quite a few errors in some of the shaders, which I fixed in this commit. I'm considering adding this rules.txt parsing and automated shader compilation testing to the build process. Also, I fixed Clarity's name and description since Monochromia isn't available anymore and Xenoblade's resolution pack had a lot of weird blank lines before their #version declaration, which my converter didn't like. --- .../93bde02ae446a30f_000000000000001c_ps.txt | 2 +- Enhancements/BreathOfTheWild_Clarity/rules.txt | 4 ++-- .../9e9abde99f9510dc_000000000000001c_ps.txt | 3 +-- .../03285368cf940e37_0000000000000079_ps.txt | 4 ++-- .../dda6656146476243_0000000000000000_vs.txt | 1 - .../284b1bf9010d4e57_0000000000000079_ps.txt | 3 +-- .../78a2659662685d55_0000000000000079_ps.txt | 2 +- .../007148d1db7f78e7_0000000000000000_vs.txt | 1 - .../0b8b33c2f133a514_0000000000000000_vs.txt | 1 - .../0dbac1e3ebdc5c02_0000000000000000_vs.txt | 1 - .../14f760ff4d6b05f5_0000000000000000_vs.txt | 1 - .../1f915b133a255dab_0000000000000000_vs.txt | 1 - .../20075cc6cf058a84_0000000000000000_vs.txt | 1 - .../21eafb6c514a4b35_0000000000000000_vs.txt | 1 - .../2716141e287247da_0000000000000000_vs.txt | 1 - .../330acac562ddee2b_0000000000000000_vs.txt | 1 - .../3fae14064195391b_0000000000000000_vs.txt | 1 - .../4c66e611ad14aabe_0000000000000000_vs.txt | 2 -- .../5a41baf724c1cff3_0000000000000000_vs.txt | 1 - .../6093720c5ca6289c_0000000000000000_vs.txt | 1 - .../610a9c4cb60b0bdf_0000000000000000_vs.txt | 1 - .../622450648ddbf1b2_0000000000000000_vs.txt | 1 - .../738c509776f2c113_0000000000000000_vs.txt | 1 - .../7d2d26ba00a66735_0000000000000000_vs.txt | 1 - .../7ec11ebc6ad99936_0000000000000000_vs.txt | 1 - .../8236d4df96d36e25_0000000000000000_vs.txt | 1 - .../90bdbafc1c764ae6_0000000000000000_vs.txt | 1 - .../948500d0191d1ed8_0000000000000000_vs.txt | 1 - .../9bc5e526132c9534_0000000000000000_vs.txt | 1 - .../a225baec4db6d89e_0000000000000000_vs.txt | 1 - .../ba529c2c3078fff0_0000000000000000_vs.txt | 1 - .../c01cc5b7af21f689_0000000000000000_vs.txt | 1 - .../ccc475eb7e537add_0000000000000000_vs.txt | 2 -- .../ccc6fb8b53f5f651_0000000000000000_vs.txt | 1 - .../d0664898dbf28dfa_0000000000000000_vs.txt | 1 - .../d321199dc854621f_0000000000000000_vs.txt | 1 - .../d7074f19f5ca3b20_0000000000000000_vs.txt | 1 - .../df832bc2e6d22e45_0000000000000000_vs.txt | 1 - .../dfacd3f8f448aeaa_0000000000000000_vs.txt | 1 - .../e082c1f638f8e81e_0000000000000000_vs.txt | 1 - .../e99ed318f647e1cf_0000000000000000_vs.txt | 1 - .../ec248df3384d3d18_0000000000000000_vs.txt | 2 -- .../eec2c2cee7a1d42f_0000000000000000_vs.txt | 1 - .../fa7054d25fd49999_0000000000000000_vs.txt | 2 -- .../2a8afa64e98f2977_0000000000000000_vs.txt | 3 +-- .../5c0d907ed99903ab_0000000000000000_vs.txt | 3 +-- 46 files changed, 10 insertions(+), 56 deletions(-) diff --git a/Enhancements/Bayonetta2_Contrasty/93bde02ae446a30f_000000000000001c_ps.txt b/Enhancements/Bayonetta2_Contrasty/93bde02ae446a30f_000000000000001c_ps.txt index ed4c71a9..834ac3bf 100644 --- a/Enhancements/Bayonetta2_Contrasty/93bde02ae446a30f_000000000000001c_ps.txt +++ b/Enhancements/Bayonetta2_Contrasty/93bde02ae446a30f_000000000000001c_ps.txt @@ -3,7 +3,7 @@ #extension GL_ARB_separate_shader_objects : enable // shader 93bde02ae446a30f//lens dirt -const float lensDirt = $lensDirt; +const float lensDirt = 1.0; uniform ivec4 uf_remappedPS[1]; uniform float uf_alphaTestRef; diff --git a/Enhancements/BreathOfTheWild_Clarity/rules.txt b/Enhancements/BreathOfTheWild_Clarity/rules.txt index 4175cb4e..6a558f5d 100644 --- a/Enhancements/BreathOfTheWild_Clarity/rules.txt +++ b/Enhancements/BreathOfTheWild_Clarity/rules.txt @@ -1,8 +1,8 @@ [Definition] titleIds = 00050000101C9300,00050000101C9400,00050000101C9500 -name = "Clarity (NOT COMPATIBLE WITH MONOCHROMIA)" +name = "Clarity" path = "The Legend of Zelda: Breath of the Wild/Enhancements/Clarity" -description = NOT COMPATIBLE WITH MONOCHROMIA! Select the visual look of the game that you'll like with these hand-made presets that adjusts saturation, vibrance, colors and more. You can select a preset. Selecting "User-Defined" requires making your own preset. check the "BreathOfTheWild_Clarity/37040a485a29d54e_00000000000003c9_ps.txt" file in your graphicPacks folder to create one. +description = Select the visual look of the game that you'll like with these hand-made presets that adjusts saturation, vibrance, colors and more. You can select a preset. Selecting "User-Defined" requires making your own preset. check the "BreathOfTheWild_Clarity/37040a485a29d54e_00000000000003c9_ps.txt" file in your graphicPacks folder to create one. version = 4 [Preset] diff --git a/Enhancements/DrLuigi_!AntiAliasing/9e9abde99f9510dc_000000000000001c_ps.txt b/Enhancements/DrLuigi_!AntiAliasing/9e9abde99f9510dc_000000000000001c_ps.txt index 2c1a01cb..b34acd7b 100644 --- a/Enhancements/DrLuigi_!AntiAliasing/9e9abde99f9510dc_000000000000001c_ps.txt +++ b/Enhancements/DrLuigi_!AntiAliasing/9e9abde99f9510dc_000000000000001c_ps.txt @@ -1,7 +1,6 @@ #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable -#extension GL_EXT_gpu_shader4 : enable // shader 9e9abde99f9510dc uniform float uf_alphaTestRef; layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf489e000 res 1280x720x1 dim 1 tm: 4 format 001a compSel: 0 1 2 3 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler0 ClampX/Y/Z: 2 2 0 border: 0 @@ -48,7 +47,7 @@ R1i = floatBitsToInt(passParameterSem128); R5i.xyz = floatBitsToInt(texture(textureUnitPS0, intBitsToFloat(R1i.zw)).xyz); R6i.xyz = floatBitsToInt(texture(textureUnitPS0, intBitsToFloat(R1i.xy)).xyz); -ivec2 resolution = textureSize2D(textureUnitPS0,0); +ivec2 resolution = textureSize(textureUnitPS0,0); float iresX = float(resolution.x)/float(1280); float iresY = float(resolution.y)/float(720); diff --git a/Enhancements/NewSuperMarioBrosU_FancyFX/03285368cf940e37_0000000000000079_ps.txt b/Enhancements/NewSuperMarioBrosU_FancyFX/03285368cf940e37_0000000000000079_ps.txt index a3670987..2563240d 100644 --- a/Enhancements/NewSuperMarioBrosU_FancyFX/03285368cf940e37_0000000000000079_ps.txt +++ b/Enhancements/NewSuperMarioBrosU_FancyFX/03285368cf940e37_0000000000000079_ps.txt @@ -5,8 +5,8 @@ //float dither = $dither ; //float scaleShader = $scaleShader; -float scaleBlur = ($scaleBlur); //0.25 4k -int sampleScale = 2; +float scaleBlur = $scaleBlur; //0.25 4k +const int sampleScale = 2; //float lightBloom = 0.95; diff --git a/Enhancements/TokyoMirage_!VideoPanNScan/dda6656146476243_0000000000000000_vs.txt b/Enhancements/TokyoMirage_!VideoPanNScan/dda6656146476243_0000000000000000_vs.txt index 4e531608..ef9919a4 100644 --- a/Enhancements/TokyoMirage_!VideoPanNScan/dda6656146476243_0000000000000000_vs.txt +++ b/Enhancements/TokyoMirage_!VideoPanNScan/dda6656146476243_0000000000000000_vs.txt @@ -1,7 +1,6 @@ #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable -#extension GL_ARB_shading_language_packing : enable // shader dda6656146476243 //Video aspect const float UI = $UIAspectX; diff --git a/Resolutions/Bayonetta2_Resolution/284b1bf9010d4e57_0000000000000079_ps.txt b/Resolutions/Bayonetta2_Resolution/284b1bf9010d4e57_0000000000000079_ps.txt index 914d520b..d68f25d7 100644 --- a/Resolutions/Bayonetta2_Resolution/284b1bf9010d4e57_0000000000000079_ps.txt +++ b/Resolutions/Bayonetta2_Resolution/284b1bf9010d4e57_0000000000000079_ps.txt @@ -2,12 +2,11 @@ #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader 284b1bf9010d4e57 -//const float scaleFactor = ($gameHeight/$height); layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf489f800 res 1280x720x1 dim 1 tm: 4 format 001a compSel: 0 1 2 3 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler0 ClampX/Y/Z: 2 2 2 border: 0 layout(location = 0) in vec4 passParameterSem133; layout(location = 0) out vec4 passPixelColor0; uniform vec2 uf_fragCoordScale; -const float scaleFactor = uf_fragCoordScale.x; +float scaleFactor = uf_fragCoordScale.x; int clampFI32(int v) { if( v == 0x7FFFFFFF ) diff --git a/Resolutions/Bayonetta2_Resolution/78a2659662685d55_0000000000000079_ps.txt b/Resolutions/Bayonetta2_Resolution/78a2659662685d55_0000000000000079_ps.txt index 343077d1..f667ea99 100644 --- a/Resolutions/Bayonetta2_Resolution/78a2659662685d55_0000000000000079_ps.txt +++ b/Resolutions/Bayonetta2_Resolution/78a2659662685d55_0000000000000079_ps.txt @@ -7,7 +7,7 @@ layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf4c24000 res layout(location = 0) in vec4 passParameterSem133; layout(location = 0) out vec4 passPixelColor0; uniform vec2 uf_fragCoordScale; -const float scaleFactor = uf_fragCoordScale.x; +float scaleFactor = uf_fragCoordScale.x; int clampFI32(int v) { if( v == 0x7FFFFFFF ) diff --git a/Resolutions/XenobladeX_Resolution/007148d1db7f78e7_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/007148d1db7f78e7_0000000000000000_vs.txt index 388f1429..7dce6f86 100644 --- a/Resolutions/XenobladeX_Resolution/007148d1db7f78e7_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/007148d1db7f78e7_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/0b8b33c2f133a514_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/0b8b33c2f133a514_0000000000000000_vs.txt index 3b8cc1a2..1ba1395b 100644 --- a/Resolutions/XenobladeX_Resolution/0b8b33c2f133a514_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/0b8b33c2f133a514_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/0dbac1e3ebdc5c02_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/0dbac1e3ebdc5c02_0000000000000000_vs.txt index 1809ccea..43ec7bba 100644 --- a/Resolutions/XenobladeX_Resolution/0dbac1e3ebdc5c02_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/0dbac1e3ebdc5c02_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/14f760ff4d6b05f5_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/14f760ff4d6b05f5_0000000000000000_vs.txt index 92a7e146..fd30aef7 100644 --- a/Resolutions/XenobladeX_Resolution/14f760ff4d6b05f5_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/14f760ff4d6b05f5_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/1f915b133a255dab_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/1f915b133a255dab_0000000000000000_vs.txt index aca5e930..e7b1247e 100644 --- a/Resolutions/XenobladeX_Resolution/1f915b133a255dab_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/1f915b133a255dab_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/20075cc6cf058a84_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/20075cc6cf058a84_0000000000000000_vs.txt index 1d6c2469..51401071 100644 --- a/Resolutions/XenobladeX_Resolution/20075cc6cf058a84_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/20075cc6cf058a84_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/21eafb6c514a4b35_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/21eafb6c514a4b35_0000000000000000_vs.txt index 8d75367e..28a7a2ac 100644 --- a/Resolutions/XenobladeX_Resolution/21eafb6c514a4b35_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/21eafb6c514a4b35_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/2716141e287247da_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/2716141e287247da_0000000000000000_vs.txt index 1dec8d73..c88c57d2 100644 --- a/Resolutions/XenobladeX_Resolution/2716141e287247da_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/2716141e287247da_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/330acac562ddee2b_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/330acac562ddee2b_0000000000000000_vs.txt index f7780d10..628d3c62 100644 --- a/Resolutions/XenobladeX_Resolution/330acac562ddee2b_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/330acac562ddee2b_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/3fae14064195391b_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/3fae14064195391b_0000000000000000_vs.txt index 22a40be2..3bb7d981 100644 --- a/Resolutions/XenobladeX_Resolution/3fae14064195391b_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/3fae14064195391b_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/4c66e611ad14aabe_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/4c66e611ad14aabe_0000000000000000_vs.txt index 72c5b5f3..d61b30cc 100644 --- a/Resolutions/XenobladeX_Resolution/4c66e611ad14aabe_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/4c66e611ad14aabe_0000000000000000_vs.txt @@ -1,5 +1,3 @@ - - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/5a41baf724c1cff3_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/5a41baf724c1cff3_0000000000000000_vs.txt index 0a52fcf0..72f99085 100644 --- a/Resolutions/XenobladeX_Resolution/5a41baf724c1cff3_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/5a41baf724c1cff3_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/6093720c5ca6289c_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/6093720c5ca6289c_0000000000000000_vs.txt index d96b54b6..7db7bff5 100644 --- a/Resolutions/XenobladeX_Resolution/6093720c5ca6289c_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/6093720c5ca6289c_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/610a9c4cb60b0bdf_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/610a9c4cb60b0bdf_0000000000000000_vs.txt index 690a2e30..72d48423 100644 --- a/Resolutions/XenobladeX_Resolution/610a9c4cb60b0bdf_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/610a9c4cb60b0bdf_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/622450648ddbf1b2_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/622450648ddbf1b2_0000000000000000_vs.txt index 7c613d70..17867313 100644 --- a/Resolutions/XenobladeX_Resolution/622450648ddbf1b2_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/622450648ddbf1b2_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/738c509776f2c113_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/738c509776f2c113_0000000000000000_vs.txt index 480ef9d4..616e4bd1 100644 --- a/Resolutions/XenobladeX_Resolution/738c509776f2c113_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/738c509776f2c113_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/7d2d26ba00a66735_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/7d2d26ba00a66735_0000000000000000_vs.txt index 1c00496f..b307682b 100644 --- a/Resolutions/XenobladeX_Resolution/7d2d26ba00a66735_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/7d2d26ba00a66735_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/7ec11ebc6ad99936_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/7ec11ebc6ad99936_0000000000000000_vs.txt index 8aa534c1..bb26088d 100644 --- a/Resolutions/XenobladeX_Resolution/7ec11ebc6ad99936_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/7ec11ebc6ad99936_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/8236d4df96d36e25_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/8236d4df96d36e25_0000000000000000_vs.txt index e8188e24..28b30940 100644 --- a/Resolutions/XenobladeX_Resolution/8236d4df96d36e25_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/8236d4df96d36e25_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/90bdbafc1c764ae6_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/90bdbafc1c764ae6_0000000000000000_vs.txt index 07e99914..f3036805 100644 --- a/Resolutions/XenobladeX_Resolution/90bdbafc1c764ae6_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/90bdbafc1c764ae6_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/948500d0191d1ed8_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/948500d0191d1ed8_0000000000000000_vs.txt index 5a9b5867..2401d2b7 100644 --- a/Resolutions/XenobladeX_Resolution/948500d0191d1ed8_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/948500d0191d1ed8_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/9bc5e526132c9534_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/9bc5e526132c9534_0000000000000000_vs.txt index 23d3eb5b..87251b20 100644 --- a/Resolutions/XenobladeX_Resolution/9bc5e526132c9534_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/9bc5e526132c9534_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/a225baec4db6d89e_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/a225baec4db6d89e_0000000000000000_vs.txt index 8e758169..d099dd6d 100644 --- a/Resolutions/XenobladeX_Resolution/a225baec4db6d89e_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/a225baec4db6d89e_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/ba529c2c3078fff0_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/ba529c2c3078fff0_0000000000000000_vs.txt index e3329f73..5896ccab 100644 --- a/Resolutions/XenobladeX_Resolution/ba529c2c3078fff0_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/ba529c2c3078fff0_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/c01cc5b7af21f689_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/c01cc5b7af21f689_0000000000000000_vs.txt index 97282b76..88b33abc 100644 --- a/Resolutions/XenobladeX_Resolution/c01cc5b7af21f689_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/c01cc5b7af21f689_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/ccc475eb7e537add_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/ccc475eb7e537add_0000000000000000_vs.txt index 7c1dc2d9..b8507d1e 100644 --- a/Resolutions/XenobladeX_Resolution/ccc475eb7e537add_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/ccc475eb7e537add_0000000000000000_vs.txt @@ -1,5 +1,3 @@ - - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/ccc6fb8b53f5f651_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/ccc6fb8b53f5f651_0000000000000000_vs.txt index 5370c570..33737511 100644 --- a/Resolutions/XenobladeX_Resolution/ccc6fb8b53f5f651_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/ccc6fb8b53f5f651_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/d0664898dbf28dfa_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/d0664898dbf28dfa_0000000000000000_vs.txt index e1093c50..54cbb21d 100644 --- a/Resolutions/XenobladeX_Resolution/d0664898dbf28dfa_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/d0664898dbf28dfa_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/d321199dc854621f_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/d321199dc854621f_0000000000000000_vs.txt index 5d07b15a..25ee46fc 100644 --- a/Resolutions/XenobladeX_Resolution/d321199dc854621f_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/d321199dc854621f_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/d7074f19f5ca3b20_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/d7074f19f5ca3b20_0000000000000000_vs.txt index e44feee8..93458756 100644 --- a/Resolutions/XenobladeX_Resolution/d7074f19f5ca3b20_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/d7074f19f5ca3b20_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/df832bc2e6d22e45_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/df832bc2e6d22e45_0000000000000000_vs.txt index 8b419837..47621a45 100644 --- a/Resolutions/XenobladeX_Resolution/df832bc2e6d22e45_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/df832bc2e6d22e45_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/dfacd3f8f448aeaa_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/dfacd3f8f448aeaa_0000000000000000_vs.txt index f2476c2d..42ad5b9e 100644 --- a/Resolutions/XenobladeX_Resolution/dfacd3f8f448aeaa_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/dfacd3f8f448aeaa_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/e082c1f638f8e81e_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/e082c1f638f8e81e_0000000000000000_vs.txt index f3908d09..6a0eb05e 100644 --- a/Resolutions/XenobladeX_Resolution/e082c1f638f8e81e_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/e082c1f638f8e81e_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/e99ed318f647e1cf_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/e99ed318f647e1cf_0000000000000000_vs.txt index ae5da061..dd821b2b 100644 --- a/Resolutions/XenobladeX_Resolution/e99ed318f647e1cf_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/e99ed318f647e1cf_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/ec248df3384d3d18_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/ec248df3384d3d18_0000000000000000_vs.txt index 19e3c518..c1424ab2 100644 --- a/Resolutions/XenobladeX_Resolution/ec248df3384d3d18_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/ec248df3384d3d18_0000000000000000_vs.txt @@ -1,5 +1,3 @@ - - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Resolutions/XenobladeX_Resolution/eec2c2cee7a1d42f_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/eec2c2cee7a1d42f_0000000000000000_vs.txt index 1a9e79b9..7e2a16bc 100644 --- a/Resolutions/XenobladeX_Resolution/eec2c2cee7a1d42f_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/eec2c2cee7a1d42f_0000000000000000_vs.txt @@ -1,4 +1,3 @@ - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_shading_language_packing : enable diff --git a/Resolutions/XenobladeX_Resolution/fa7054d25fd49999_0000000000000000_vs.txt b/Resolutions/XenobladeX_Resolution/fa7054d25fd49999_0000000000000000_vs.txt index 132aec97..a2dae5b3 100644 --- a/Resolutions/XenobladeX_Resolution/fa7054d25fd49999_0000000000000000_vs.txt +++ b/Resolutions/XenobladeX_Resolution/fa7054d25fd49999_0000000000000000_vs.txt @@ -1,5 +1,3 @@ - - #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable diff --git a/Workarounds/Wonderful101_ShadowRemoval/2a8afa64e98f2977_0000000000000000_vs.txt b/Workarounds/Wonderful101_ShadowRemoval/2a8afa64e98f2977_0000000000000000_vs.txt index 6308c04b..a8401707 100644 --- a/Workarounds/Wonderful101_ShadowRemoval/2a8afa64e98f2977_0000000000000000_vs.txt +++ b/Workarounds/Wonderful101_ShadowRemoval/2a8afa64e98f2977_0000000000000000_vs.txt @@ -1,7 +1,6 @@ #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable -#extension GL_ARB_shading_language_packing : enable // shader 2a8afa64e98f2977 layout(binding = 1, std140) uniform uniformBlockVS1 { @@ -36,7 +35,7 @@ else if( v == 0xFFFFFFFF ) return floatBitsToInt(0.0); return floatBitsToInt(clamp(intBitsToFloat(v), 0.0, 1.0)); } -//float mul_nonIEEE(float a, float b){ return min(a*b,min(abs(a)*3.40282347E+38F,abs(b)*3.40282347E+38F)); } +float mul_nonIEEE(float a, float b){ return min(a*b,min(abs(a)*3.40282347E+38F,abs(b)*3.40282347E+38F)); } void main() { ivec4 R0i = ivec4(0); diff --git a/Workarounds/Wonderful101_ShadowRemoval/5c0d907ed99903ab_0000000000000000_vs.txt b/Workarounds/Wonderful101_ShadowRemoval/5c0d907ed99903ab_0000000000000000_vs.txt index 96a38c85..c739b0e6 100644 --- a/Workarounds/Wonderful101_ShadowRemoval/5c0d907ed99903ab_0000000000000000_vs.txt +++ b/Workarounds/Wonderful101_ShadowRemoval/5c0d907ed99903ab_0000000000000000_vs.txt @@ -1,7 +1,6 @@ #version 420 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable -#extension GL_ARB_shading_language_packing : enable // shader 5c0d907ed99903ab uniform ivec4 uf_remappedVS[9]; uniform vec2 uf_windowSpaceToClipSpaceTransform; @@ -20,7 +19,7 @@ else if( v == 0xFFFFFFFF ) return floatBitsToInt(0.0); return floatBitsToInt(clamp(intBitsToFloat(v), 0.0, 1.0)); } -//float mul_nonIEEE(float a, float b){ return min(a*b,min(abs(a)*3.40282347E+38F,abs(b)*3.40282347E+38F)); } +float mul_nonIEEE(float a, float b){ return min(a*b,min(abs(a)*3.40282347E+38F,abs(b)*3.40282347E+38F)); } void main() { ivec4 R0i = ivec4(0);