diff --git a/Enhancement/BreathOfTheWild_Bloom/38d70ed9280bb3bc_0000000000000079_ps.txt b/Enhancement/BreathOfTheWild_AdjustableBloom/38d70ed9280bb3bc_0000000000000079_ps.txt similarity index 100% rename from Enhancement/BreathOfTheWild_Bloom/38d70ed9280bb3bc_0000000000000079_ps.txt rename to Enhancement/BreathOfTheWild_AdjustableBloom/38d70ed9280bb3bc_0000000000000079_ps.txt diff --git a/Enhancement/BreathOfTheWild_Bloom/rules.txt b/Enhancement/BreathOfTheWild_AdjustableBloom/rules.txt similarity index 100% rename from Enhancement/BreathOfTheWild_Bloom/rules.txt rename to Enhancement/BreathOfTheWild_AdjustableBloom/rules.txt diff --git a/Enhancement/MK8_Bloom/e90feef2bca6cb2e_00000000000003c9_ps.txt b/Enhancement/MK8_AdjustableBloom/e90feef2bca6cb2e_00000000000003c9_ps.txt similarity index 100% rename from Enhancement/MK8_Bloom/e90feef2bca6cb2e_00000000000003c9_ps.txt rename to Enhancement/MK8_AdjustableBloom/e90feef2bca6cb2e_00000000000003c9_ps.txt diff --git a/Enhancement/MK8_Bloom/rules.txt b/Enhancement/MK8_AdjustableBloom/rules.txt similarity index 100% rename from Enhancement/MK8_Bloom/rules.txt rename to Enhancement/MK8_AdjustableBloom/rules.txt diff --git a/Enhancement/Splatoon_AdjustableBloom/34eaf9e211e76379_00000000000003c9_ps.txt b/Enhancement/Splatoon_AdjustableBloom/34eaf9e211e76379_00000000000003c9_ps.txt new file mode 100644 index 00000000..7f0f6219 --- /dev/null +++ b/Enhancement/Splatoon_AdjustableBloom/34eaf9e211e76379_00000000000003c9_ps.txt @@ -0,0 +1,116 @@ +#version 420 +#extension GL_ARB_texture_gather : enable +const float bloomFactor = 0.4; +// shader 34eaf9e211e76379 +uniform ivec4 uf_remappedPS[4]; +layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf45c6000 res 1280x720x1 dim 1 tm: 4 format 0816 compSel: 0 1 2 5 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler0 ClampX/Y/Z: 2 2 2 border: 1 +layout(binding = 1) uniform sampler2D textureUnitPS1;// Tex1 addr 0x16466800 res 1280x720x1 dim 1 tm: 4 format 0806 compSel: 0 4 4 5 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler1 ClampX/Y/Z: 2 2 2 border: 1 +layout(location = 0) in vec4 passParameterSem0; +layout(location = 1) in vec4 passParameterSem1; +layout(location = 2) in vec4 passParameterSem2; +layout(location = 0) out vec4 passPixelColor0; +uniform vec2 uf_fragCoordScale; +int clampFI32(int v) +{ +if( v == 0x7FFFFFFF ) + return floatBitsToInt(1.0); +else if( v == 0xFFFFFFFF ) + return floatBitsToInt(0.0); +return floatBitsToInt(clamp(intBitsToFloat(v), 0.0, 1.0)); +} +float mul_nonIEEE(float a, float b){ if( a == 0.0 || b == 0.0 ) return 0.0; return a*b; } +void main() +{ +vec4 R0f = vec4(0.0); +vec4 R1f = vec4(0.0); +vec4 R2f = vec4(0.0); +vec4 R3f = vec4(0.0); +vec4 R4f = vec4(0.0); +vec4 R123f = vec4(0.0); +vec4 R126f = vec4(0.0); +vec4 R127f = vec4(0.0); +float backupReg0f, backupReg1f, backupReg2f, backupReg3f, backupReg4f; +vec4 PV0f = vec4(0.0), PV1f = vec4(0.0); +float PS0f = 0.0, PS1f = 0.0; +vec4 tempf = vec4(0.0); +float tempResultf; +int tempResulti; +ivec4 ARi = ivec4(0); +bool predResult = true; +vec3 cubeMapSTM; +int cubeMapFaceId; +R0f = passParameterSem0; +R1f = passParameterSem1; +R2f = passParameterSem2; +R3f.xyzw = (texture(textureUnitPS0, R1f.xy).xyzw); +R1f.xyzw = (texture(textureUnitPS0, R1f.zw).xyzw); +R4f.xyzw = (texture(textureUnitPS0, R2f.xy).xyzw); +R2f.xyzw = (texture(textureUnitPS0, R2f.zw).xyzw); +R0f.x = (texture(textureUnitPS1, R0f.xy).x); +// 0 +backupReg0f = R0f.x; +PV0f.x = R3f.y + R1f.y; +PV0f.x /= 2.0; +PV0f.y = R3f.x + R1f.x; +PV0f.y /= 2.0; +PV0f.z = R3f.w + R1f.w; +PV0f.z /= 2.0; +PV0f.w = R3f.z + R1f.z; +PV0f.w /= 2.0; +R127f.w = (backupReg0f * intBitsToFloat(uf_remappedPS[0].z) + intBitsToFloat(uf_remappedPS[0].w)); +R127f.w = clamp(R127f.w, 0.0, 1.0); +PS0f = R127f.w; +// 1 +R123f.x = (R4f.y * 0.5 + PV0f.x); +PV1f.x = R123f.x; +R123f.y = (R4f.x * 0.5 + PV0f.y); +PV1f.y = R123f.y; +R123f.z = (R4f.w * 0.5 + PV0f.z); +PV1f.z = R123f.z; +R123f.w = (R4f.z * 0.5 + PV0f.w); +PV1f.w = R123f.w; +R127f.z = mul_nonIEEE(PS0f, intBitsToFloat(uf_remappedPS[1].z)); +PS1f = R127f.z; +// 2 +R123f.x = (R2f.y * 0.5 + PV1f.x)/2.0; +PV0f.x = R123f.x; +R123f.y = (R2f.x * 0.5 + PV1f.y)/2.0; +PV0f.y = R123f.y; +R123f.z = (R2f.w * 0.5 + PV1f.z)/2.0; +PV0f.z = R123f.z; +R123f.w = (R2f.z * 0.5 + PV1f.w)/2.0; +PV0f.w = R123f.w; +// 3 +PV1f.x = max(PV0f.w, 0.0); +PV1f.y = max(PV0f.y, 0.0); +PV1f.z = max(PV0f.z, 0.0); +PV1f.w = max(PV0f.x, 0.0); +// 4 +R127f.x = min(PV1f.y, intBitsToFloat(0x461c4000)); +PV0f.x = R127f.x; +R127f.y = min(PV1f.w, intBitsToFloat(0x461c4000)); +PV0f.y = R127f.y; +R126f.z = min(PV1f.x, intBitsToFloat(0x461c4000)); +PV0f.z = R126f.z; +R126f.w = min(PV1f.z, intBitsToFloat(0x461c4000)); +PV0f.w = R126f.w; +// 5 +tempf.x = dot(vec4(PV0f.x,PV0f.y,PV0f.z,PV0f.w),vec4(intBitsToFloat(uf_remappedPS[2].x),intBitsToFloat(uf_remappedPS[2].y),intBitsToFloat(uf_remappedPS[2].z),intBitsToFloat(uf_remappedPS[2].w))); +tempf.x = clamp(tempf.x, 0.0, 1.0); +PV1f.x = tempf.x; +PV1f.y = tempf.x; +PV1f.z = tempf.x; +PV1f.w = tempf.x; +// 6 +R123f.y = (R127f.w * R127f.z + PV1f.x); +PV0f.y = R123f.y; +// 7 +PV1f.x = mul_nonIEEE(PV0f.y, intBitsToFloat(uf_remappedPS[3].z)); +// 8 +R2f.x = mul_nonIEEE(R127f.x, PV1f.x * bloomFactor); +R2f.y = mul_nonIEEE(R127f.y, PV1f.x * bloomFactor); +R2f.z = mul_nonIEEE(R126f.z, PV1f.x * bloomFactor); +R2f.w = mul_nonIEEE(R126f.w, PV1f.x * bloomFactor); +// export +passPixelColor0 = vec4(R2f.x, R2f.y, R2f.z, R2f.w); +} diff --git a/Enhancement/Splatoon_AdjustableBloom/rules.txt b/Enhancement/Splatoon_AdjustableBloom/rules.txt new file mode 100644 index 00000000..c74ccc5f --- /dev/null +++ b/Enhancement/Splatoon_AdjustableBloom/rules.txt @@ -0,0 +1,4 @@ +[Definition] +titleIds = 0005000010176900,0005000010176A00,0005000010162B000 +name = "Splatoon - Adjustable Bloom" +version = 2 \ No newline at end of file diff --git a/Enhancement/TheWindWaker_ReducedBloom/960d3ef6662043c7_0000000000000079_ps.txt b/Enhancement/TheWindWaker_AdjustableBloom/960d3ef6662043c7_0000000000000079_ps.txt similarity index 96% rename from Enhancement/TheWindWaker_ReducedBloom/960d3ef6662043c7_0000000000000079_ps.txt rename to Enhancement/TheWindWaker_AdjustableBloom/960d3ef6662043c7_0000000000000079_ps.txt index f483d7c8..d3b101fa 100644 --- a/Enhancement/TheWindWaker_ReducedBloom/960d3ef6662043c7_0000000000000079_ps.txt +++ b/Enhancement/TheWindWaker_AdjustableBloom/960d3ef6662043c7_0000000000000079_ps.txt @@ -1,45 +1,45 @@ -#version 420 -#extension GL_ARB_texture_gather : enable - -const float bloomFactor = 0.4; // bloom strength - -// shader 960d3ef6662043c7 -layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf4000800 res 480x270x1 dim 1 tm: 4 format 0816 compSel: 0 1 2 5 mipView: 0x0 (num 0x4) sliceView: 0x0 (num 0x1) Sampler0 ClampX/Y/Z: 2 2 2 border: 1 -layout(location = 0) in vec4 passParameterSem0; -layout(location = 0) out vec4 passPixelColor0; -uniform vec2 uf_fragCoordScale; -int clampFI32(int v) -{ -if( v == 0x7FFFFFFF ) - return floatBitsToInt(1.0); -else if( v == 0xFFFFFFFF ) - return floatBitsToInt(0.0); -return floatBitsToInt(clamp(intBitsToFloat(v), 0.0, 1.0)); -} -float mul_nonIEEE(float a, float b){ if( a == 0.0 || b == 0.0 ) return 0.0; return a*b; } -void main() -{ -vec4 R0f = vec4(0.0); -float backupReg0f, backupReg1f, backupReg2f, backupReg3f, backupReg4f; -vec4 PV0f = vec4(0.0), PV1f = vec4(0.0); -float PS0f = 0.0, PS1f = 0.0; -vec4 tempf = vec4(0.0); -float tempResultf; -int tempResulti; -ivec4 ARi = ivec4(0); -bool predResult = true; - -vec3 cubeMapSTM; -int cubeMapFaceId; -R0f = passParameterSem0; -R0f.xyz = texture(textureUnitPS0, R0f.xy).xyz * bloomFactor; -// 0 -/* -backupReg0f = R0f.x; -backupReg1f = R0f.y; -backupReg2f = R0f.z; -R0f.xyz = vec3(backupReg0f,backupReg1f,backupReg2f); -*/ -// export -passPixelColor0 = R0f.xyzw; -} +#version 420 +#extension GL_ARB_texture_gather : enable + +const float bloomFactor = 0.4; // bloom strength + +// shader 960d3ef6662043c7 +layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf4000800 res 480x270x1 dim 1 tm: 4 format 0816 compSel: 0 1 2 5 mipView: 0x0 (num 0x4) sliceView: 0x0 (num 0x1) Sampler0 ClampX/Y/Z: 2 2 2 border: 1 +layout(location = 0) in vec4 passParameterSem0; +layout(location = 0) out vec4 passPixelColor0; +uniform vec2 uf_fragCoordScale; +int clampFI32(int v) +{ +if( v == 0x7FFFFFFF ) + return floatBitsToInt(1.0); +else if( v == 0xFFFFFFFF ) + return floatBitsToInt(0.0); +return floatBitsToInt(clamp(intBitsToFloat(v), 0.0, 1.0)); +} +float mul_nonIEEE(float a, float b){ if( a == 0.0 || b == 0.0 ) return 0.0; return a*b; } +void main() +{ +vec4 R0f = vec4(0.0); +float backupReg0f, backupReg1f, backupReg2f, backupReg3f, backupReg4f; +vec4 PV0f = vec4(0.0), PV1f = vec4(0.0); +float PS0f = 0.0, PS1f = 0.0; +vec4 tempf = vec4(0.0); +float tempResultf; +int tempResulti; +ivec4 ARi = ivec4(0); +bool predResult = true; + +vec3 cubeMapSTM; +int cubeMapFaceId; +R0f = passParameterSem0; +R0f.xyz = texture(textureUnitPS0, R0f.xy).xyz * bloomFactor; +// 0 +/* +backupReg0f = R0f.x; +backupReg1f = R0f.y; +backupReg2f = R0f.z; +R0f.xyz = vec3(backupReg0f,backupReg1f,backupReg2f); +*/ +// export +passPixelColor0 = R0f.xyzw; +} diff --git a/Enhancement/TheWindWaker_AdjustableBloom/rules.txt b/Enhancement/TheWindWaker_AdjustableBloom/rules.txt new file mode 100644 index 00000000..3325af1d --- /dev/null +++ b/Enhancement/TheWindWaker_AdjustableBloom/rules.txt @@ -0,0 +1,4 @@ +[Definition] +titleIds = 0005000010143400,0005000010143600,0005000010143500 +name = "The Wind Waker HD - Adjustable Bloom" +version = 2 \ No newline at end of file diff --git a/Enhancement/TheWindWaker_ReducedBloom/rules.txt b/Enhancement/TheWindWaker_ReducedBloom/rules.txt deleted file mode 100644 index 3f552a7d..00000000 --- a/Enhancement/TheWindWaker_ReducedBloom/rules.txt +++ /dev/null @@ -1,4 +0,0 @@ -[Definition] -titleIds = 0005000010143500 -name = "The Wind Waker HD - Reduced Bloom" -version = 2