From 3cbdbd3a6fc4b31704eb3591a1d11ff964ccec0c Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 4 Dec 2018 16:18:00 -0800 Subject: [PATCH] Fix BotW Antialiasing pack always using FXAA --- .../0f2b9ee517917425_00000000000003c9_ps.txt | 4 ++-- .../f14bb57cd5c9cb77_00000000000003c9_ps.txt | 12 ++++++------ Enhancements/BreathOfTheWild_!AntiAliasing/rules.txt | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Enhancements/BreathOfTheWild_!AntiAliasing/0f2b9ee517917425_00000000000003c9_ps.txt b/Enhancements/BreathOfTheWild_!AntiAliasing/0f2b9ee517917425_00000000000003c9_ps.txt index 736927c4..f71eebda 100644 --- a/Enhancements/BreathOfTheWild_!AntiAliasing/0f2b9ee517917425_00000000000003c9_ps.txt +++ b/Enhancements/BreathOfTheWild_!AntiAliasing/0f2b9ee517917425_00000000000003c9_ps.txt @@ -9,7 +9,7 @@ #define aaSharper $inventorySharper #define aaBlurrier $inventoryBlurrier -#if (preset == 0) // Disabled +#if (preset == 0) // Native AA Disabled layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf49b1800 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(location = 0) in vec4 passParameterSem2; layout(location = 0) out vec4 passPixelColor0; @@ -20,7 +20,7 @@ passPixelColor0 = texture(textureUnitPS0, passParameterSem2.xy); } #endif -#if (preset == 1) // Enabled +#if (preset == 1) // Native AA Enabled uniform ivec4 uf_remappedPS[2]; layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf49b1800 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 0x37b40000 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 diff --git a/Enhancements/BreathOfTheWild_!AntiAliasing/f14bb57cd5c9cb77_00000000000003c9_ps.txt b/Enhancements/BreathOfTheWild_!AntiAliasing/f14bb57cd5c9cb77_00000000000003c9_ps.txt index 4a138153..58d6e882 100644 --- a/Enhancements/BreathOfTheWild_!AntiAliasing/f14bb57cd5c9cb77_00000000000003c9_ps.txt +++ b/Enhancements/BreathOfTheWild_!AntiAliasing/f14bb57cd5c9cb77_00000000000003c9_ps.txt @@ -6,9 +6,9 @@ // shader f14bb57cd5c9cb77 - dumped 1.15 // Used for: Removing/Restoring the native BotW World Anti-Aliasing Implementation -#define preset 2 -#define aaSharper 0.0 -#define aaBlurrier 0.0 +#define preset $preset +#define aaSharper $inventorySharper +#define aaBlurrier $inventoryBlurrier #if (preset == 0) // Native AA Disabled layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf49b1800 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 @@ -176,9 +176,9 @@ passPixelColor0 = vec4(R2f.x, R2f.y, R2f.z, R2f.w); #if (preset == 2) // FXAA /*-----------------------------settings-------------------------------------*/ -#define Subpix 1.0 //[0.000 to 1.000] Choose the amount of sub-pixel aliasing removal. -#define EdgeThreshold 0.0125 //[0.000 to 1.000] Edge detection threshold. The minimum amount of local contrast required to apply algorithm. -#define EdgeThresholdMin 0.0625 //[0.000 to 1.000] Darkness threshold. Trims the algorithm from processing darks. +#define Subpix $subPix //[0.000 to 1.000] Choose the amount of sub-pixel aliasing removal. +#define EdgeThreshold $edgeThreshold //[0.000 to 1.000] Edge detection threshold. The minimum amount of local contrast required to apply algorithm. +#define EdgeThresholdMin $edgeThresholdMin //[0.000 to 1.000] Darkness threshold. Trims the algorithm from processing darks. /*--------------------------------------------------------------------------*/ diff --git a/Enhancements/BreathOfTheWild_!AntiAliasing/rules.txt b/Enhancements/BreathOfTheWild_!AntiAliasing/rules.txt index b5b1df23..075f1d91 100644 --- a/Enhancements/BreathOfTheWild_!AntiAliasing/rules.txt +++ b/Enhancements/BreathOfTheWild_!AntiAliasing/rules.txt @@ -45,7 +45,6 @@ $edgeThreshold = 0.0125 $edgeThresholdMin = 0.0625 - # Adjust native AA implmentation - Only applies to Enabled preset # --- keep one of the varaibles at 0 while adjusting the other one # Sharper : Values - [0.0 - 1.0] - Recommended to Raise in increments of 0.1