From f477af61d5ac080e21dd50df85e36d2e3d0645b5 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 28 May 2017 12:19:38 -0700 Subject: [PATCH] [SM3DW] Update NO-AA --- ...5021b3379af_00000000000003c9_ps_source.txt | 51 ----- .../be99d80628d31127_00000000000003c9_ps.txt | 187 ++++++++++++++++++ .../SuperMario3DWorld_AARemoval/rules.txt | 3 +- 3 files changed, 189 insertions(+), 52 deletions(-) delete mode 100644 Enhancement/SuperMario3DWorld_AARemoval/99dde5021b3379af_00000000000003c9_ps_source.txt create mode 100644 Enhancement/SuperMario3DWorld_AARemoval/be99d80628d31127_00000000000003c9_ps.txt diff --git a/Enhancement/SuperMario3DWorld_AARemoval/99dde5021b3379af_00000000000003c9_ps_source.txt b/Enhancement/SuperMario3DWorld_AARemoval/99dde5021b3379af_00000000000003c9_ps_source.txt deleted file mode 100644 index bb83e2f6..00000000 --- a/Enhancement/SuperMario3DWorld_AARemoval/99dde5021b3379af_00000000000003c9_ps_source.txt +++ /dev/null @@ -1,51 +0,0 @@ -#version 400 -#extension GL_ARB_texture_gather : enable -// shader 99dde5021b3379af // check -uniform ivec4 uf_remappedPS[4]; -uniform sampler2D textureUnitPS0;// Tex0 addr 0xf5800800 res 1280x720x1 dim 1 tm: 4 format 0019 compSel: 0 1 2 3 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler0 ClampX/Y/Z: 2 2 2 border: 1 -uniform sampler2D textureUnitPS1;// Tex1 addr 0xf4341000 res 1280x720x1 dim 1 tm: 4 format 0001 compSel: 0 4 4 5 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler1 ClampX/Y/Z: 2 2 2 border: 1 -in vec4 passParameter0; -layout(location = 0) out vec4 passPixelColor0; -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() -{ -ivec4 R0i = ivec4(0); -ivec4 R1i = ivec4(0); -ivec4 R2i = ivec4(0); -ivec4 R3i = ivec4(0); -ivec4 R4i = ivec4(0); -ivec4 R5i = ivec4(0); -ivec4 R123i = ivec4(0); -ivec4 R126i = ivec4(0); -ivec4 R127i = ivec4(0); -int backupReg0i, backupReg1i, backupReg2i, backupReg3i, backupReg4i; -float backupReg0f, backupReg1f, backupReg2f, backupReg3f, backupReg4f; -ivec4 PV0i = ivec4(0), PV1i = ivec4(0); -int PS0i = 0, PS1i = 0; -ivec4 tempi = ivec4(0); -float tempResultf; -int tempResulti; -ivec4 ARi = ivec4(0); -bool predResult = true; -bool activeMaskStack[31]; -bool activeMaskStackC[32]; -int activeMaskIndex = 0; -activeMaskStack[0] = true; -activeMaskStackC[0] = true; -activeMaskStackC[1] = true; -int loopStuckCounter = 0; -vec3 cubeMapSTM; -int cubeMapFaceId; -R0i = floatBitsToInt(passParameter0); -//R1i.xyzw = floatBitsToInt(textureGather(textureUnitPS1, intBitsToFloat(R0i.xy)).xyzw); -R2i.xyzw = floatBitsToInt(texture(textureUnitPS0, intBitsToFloat(R0i.xy)).xyzw); -passPixelColor0 = vec4(intBitsToFloat(R2i.x), intBitsToFloat(R2i.y), intBitsToFloat(R2i.z), intBitsToFloat(R2i.w)); -} diff --git a/Enhancement/SuperMario3DWorld_AARemoval/be99d80628d31127_00000000000003c9_ps.txt b/Enhancement/SuperMario3DWorld_AARemoval/be99d80628d31127_00000000000003c9_ps.txt new file mode 100644 index 00000000..309348ac --- /dev/null +++ b/Enhancement/SuperMario3DWorld_AARemoval/be99d80628d31127_00000000000003c9_ps.txt @@ -0,0 +1,187 @@ +#version 420 +#extension GL_ARB_texture_gather : enable +// shader be99d80628d31127 +uniform ivec4 uf_remappedPS[4]; +layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf5800800 res 1280x720x1 dim 1 tm: 4 format 0019 compSel: 0 1 2 3 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 0xf4341000 res 1280x720x1 dim 1 tm: 4 format 0001 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 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){ return min(a*b,min(abs(a)*3.40282347E+38F,abs(b)*3.40282347E+38F)); } +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 R5f = 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; +bool activeMaskStack[2]; +bool activeMaskStackC[3]; +activeMaskStack[0] = false; +activeMaskStackC[0] = false; +activeMaskStackC[1] = false; +activeMaskStack[0] = true; +activeMaskStackC[0] = true; +activeMaskStackC[1] = true; +vec3 cubeMapSTM; +int cubeMapFaceId; +R0f = passParameterSem2; +if( activeMaskStackC[1] == true ) { +R4f.xyzw = (texture(textureUnitPS0, R0f.xy).xyzw); +//R2f.xyzw = (textureGather(textureUnitPS1, R0f.xy).wzxy); +} +if( activeMaskStackC[1] == true ) { +activeMaskStack[1] = activeMaskStack[0]; +activeMaskStackC[2] = activeMaskStackC[1]; +// 0 +PV0f.x = min(R2f.z, R2f.x); +PV0f.y = max(R2f.z, R2f.x); +PV0f.z = R4f.x * intBitsToFloat(uf_remappedPS[0].x); +PV0f.w = min(R2f.w, R2f.y); +PS0f = max(R2f.w, R2f.y); +// 1 +PV1f.x = min(PV0f.x, PV0f.w); +R123f.y = (R4f.y * intBitsToFloat(uf_remappedPS[0].y) + PV0f.z); +PV1f.y = R123f.y; +R127f.z = R2f.z + -(R2f.y); +PV1f.z = R127f.z; +PV1f.w = max(PV0f.y, PS0f); +R126f.z = R2f.w + -(R2f.x); +PS1f = R126f.z; +// 2 +PV0f.x = PV1f.w * intBitsToFloat(uf_remappedPS[1].x); +PV0f.y = max(PV1f.y, PV1f.w); +PV0f.z = min(PV1f.y, PV1f.x); +R3f.x = PV1f.z + PS1f; +PS0f = R3f.x; +// 3 +R1f.x = max(PV0f.x, intBitsToFloat(uf_remappedPS[1].y)); +R3f.y = -(PV0f.z) + PV0f.y; +R1f.y = R127f.z + -(R126f.z); +PS1f = R1f.y; +// 4 +predResult = (R3f.y > R1f.x); +activeMaskStack[1] = predResult; +activeMaskStackC[2] = predResult == true && activeMaskStackC[1] == true; +} +else { +activeMaskStack[1] = false; +activeMaskStackC[2] = false; +} +if( activeMaskStackC[2] == true ) { +// 0 +backupReg0f = R2f.y; +R1f.x = max(R3f.x, -(R3f.x)); +PV0f.x = R1f.x; +R2f.y = backupReg0f + R2f.x; +PV0f.y = R2f.y; +R0f.z = intBitsToFloat(uf_remappedPS[2].z) * 0.25; +R0f.w = max(R1f.y, -(R1f.y)); +PV0f.w = R0f.w; +R2f.x = -(intBitsToFloat(uf_remappedPS[3].x)); +PS0f = R2f.x; +// 1 +R3f.y = R2f.z + PV0f.y; +PV1f.y = R3f.y; +R2f.y = min(PV0f.x, PV0f.w); +PS1f = R2f.y; +// 2 +R3f.y = R2f.w + PV1f.y; +PV0f.y = R3f.y; +R1f.z = intBitsToFloat(uf_remappedPS[3].x); +R0f.w = intBitsToFloat(uf_remappedPS[3].y); +R5f.y = -(intBitsToFloat(uf_remappedPS[3].y)); +PS0f = R5f.y; +// 3 +backupReg0f = R0f.z; +R0f.z = (backupReg0f * PV0f.y + intBitsToFloat(uf_remappedPS[2].w)); +PV1f.z = R0f.z; +// 4 +backupReg0f = R2f.y; +R2f.y = max(PV1f.z, backupReg0f); +PV0f.y = R2f.y; +// 5 +R2f.y = 1.0 / PV0f.y; +PS1f = R2f.y; +// 6 +backupReg0f = R1f.y; +R1f.x = R3f.x * PS1f; +PV0f.x = R1f.x; +R1f.y = backupReg0f * PS1f; +PV0f.y = R1f.y; +// 7 +R1f.x = max(PV0f.x, -(intBitsToFloat(uf_remappedPS[2].y))); +PV1f.x = R1f.x; +R1f.y = max(PV0f.y, -(intBitsToFloat(uf_remappedPS[2].y))); +PV1f.y = R1f.y; +// 8 +R1f.x = min(PV1f.x, intBitsToFloat(uf_remappedPS[2].y)); +PV0f.x = R1f.x; +R1f.y = min(PV1f.y, intBitsToFloat(uf_remappedPS[2].y)); +PV0f.y = R1f.y; +// 9 +backupReg0f = R0f.x; +backupReg1f = R0f.y; +backupReg0f = R0f.x; +backupReg2f = R0f.w; +backupReg1f = R0f.y; +R0f.x = (PV0f.x * R2f.x + backupReg0f); +R0f.y = (PV0f.y * R5f.y + backupReg1f); +R0f.z = (PV0f.x * R1f.z + backupReg0f); +R0f.w = (PV0f.y * backupReg2f + backupReg1f); +} +if( activeMaskStackC[2] == true ) { +R1f.xyzw = (texture(textureUnitPS0, R0f.zw).xyzw); +R0f.xyzw = (texture(textureUnitPS0, R0f.xy).xyzw); +} +if( activeMaskStackC[2] == true ) { +// 0 +backupReg0f = R0f.y; +backupReg1f = R0f.x; +PV0f.x = R0f.w + R1f.w; +PV0f.x /= 2.0; +PV0f.y = R0f.z + R1f.z; +PV0f.y /= 2.0; +PV0f.z = backupReg0f + R1f.y; +PV0f.z /= 2.0; +PV0f.w = backupReg1f + R1f.x; +PV0f.w /= 2.0; +// 1 +PV1f.x = -(R4f.w) + PV0f.x; +PV1f.y = -(R4f.z) + PV0f.y; +PV1f.z = -(R4f.y) + PV0f.z; +PV1f.w = -(R4f.x) + PV0f.w; +// 2 +backupReg0f = R4f.x; +backupReg1f = R4f.y; +backupReg2f = R4f.z; +backupReg3f = R4f.w; +R4f.x = (PV1f.w * intBitsToFloat(0x3f4ccccd) + backupReg0f); +R4f.y = (PV1f.z * intBitsToFloat(0x3f4ccccd) + backupReg1f); +R4f.z = (PV1f.y * intBitsToFloat(0x3f4ccccd) + backupReg2f); +R4f.w = (PV1f.x * intBitsToFloat(0x3f4ccccd) + backupReg3f); +} +activeMaskStackC[1] = activeMaskStack[0] == true && activeMaskStackC[0] == true; +// export +passPixelColor0 = vec4(R4f.x, R4f.y, R4f.z, R4f.w); +} diff --git a/Enhancement/SuperMario3DWorld_AARemoval/rules.txt b/Enhancement/SuperMario3DWorld_AARemoval/rules.txt index b82954bc..059a9dd9 100644 --- a/Enhancement/SuperMario3DWorld_AARemoval/rules.txt +++ b/Enhancement/SuperMario3DWorld_AARemoval/rules.txt @@ -1,3 +1,4 @@ [Definition] titleIds = 0005000010145d00,0005000010145c00,0005000010106100 -name = "Super Mario 3D World - No Anti-Aliasing" \ No newline at end of file +name = "Super Mario 3D World - No Anti-Aliasing" +version = 2 \ No newline at end of file