From 189db230da0f32c8f5e1940e83ec3fe3b736b5ce Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 23 Apr 2017 09:20:17 -0700 Subject: [PATCH] Revert "[Smash] Push NVIDIA fix to main packs" This reverts commit c9bf586fd38b08340031e381f45801a00156bf0b. --- Enthusiast/Smash_2880p/rules.txt | 9 ------- Enthusiast/Smash_4320p/rules.txt | 9 ------- Enthusiast/Smash_5760p/rules.txt | 9 ------- Performance/Smash_360p/rules.txt | 37 ++++++++++---------------- Performance/Smash_540p/rules.txt | 9 ------- Performance/Smash_720p/rules.txt | 9 ------- Quality/Smash_1440p/rules.txt | 9 ------- Quality/Smash_2160p/rules.txt | 9 ------- Workaround/Smash_SNORMNVIDIA/rules.txt | 10 +++++++ 9 files changed, 24 insertions(+), 86 deletions(-) create mode 100644 Workaround/Smash_SNORMNVIDIA/rules.txt diff --git a/Enthusiast/Smash_2880p/rules.txt b/Enthusiast/Smash_2880p/rules.txt index 71af3861..d4549212 100644 --- a/Enthusiast/Smash_2880p/rules.txt +++ b/Enthusiast/Smash_2880p/rules.txt @@ -5,15 +5,6 @@ name = "Super Smash Bros. - 2880p (5K)" [TextureRedefine] # tv width = 1920 height = 1080 -formatsExcluded = 0x219 -overwriteWidth = 5120 -overwriteHeight = 2880 - -[TextureRedefine] # nvidia -width = 1920 -height = 1080 -formats = 0x219 -overwriteFormat = 0x820 overwriteWidth = 5120 overwriteHeight = 2880 diff --git a/Enthusiast/Smash_4320p/rules.txt b/Enthusiast/Smash_4320p/rules.txt index 8aec19b9..d35c87c3 100644 --- a/Enthusiast/Smash_4320p/rules.txt +++ b/Enthusiast/Smash_4320p/rules.txt @@ -5,15 +5,6 @@ name = "Super Smash Bros. - 4320p (8K)" [TextureRedefine] # tv width = 1920 height = 1080 -formatsExcluded = 0x219 -overwriteWidth = 7680 -overwriteHeight = 4320 - -[TextureRedefine] # nvidia -width = 1920 -height = 1080 -formats = 0x219 -overwriteFormat = 0x820 overwriteWidth = 7680 overwriteHeight = 4320 diff --git a/Enthusiast/Smash_5760p/rules.txt b/Enthusiast/Smash_5760p/rules.txt index 31163663..3732ac1e 100644 --- a/Enthusiast/Smash_5760p/rules.txt +++ b/Enthusiast/Smash_5760p/rules.txt @@ -5,15 +5,6 @@ name = "Super Smash Bros. - 5760p (10K)" [TextureRedefine] # tv width = 1920 height = 1080 -formatsExcluded = 0x219 -overwriteWidth = 10240 -overwriteHeight = 5760 - -[TextureRedefine] # nvidia -width = 1920 -height = 1080 -formats = 0x219 -overwriteFormat = 0x820 overwriteWidth = 10240 overwriteHeight = 5760 diff --git a/Performance/Smash_360p/rules.txt b/Performance/Smash_360p/rules.txt index 300e4508..9eb83751 100644 --- a/Performance/Smash_360p/rules.txt +++ b/Performance/Smash_360p/rules.txt @@ -5,59 +5,50 @@ name = "Super Smash Bros. - 360p" [TextureRedefine] # tv width = 1920 height = 1080 -formatsExcluded = 0x219 -overwriteWidth = 640 -overwriteHeight = 360 - -[TextureRedefine] # nvidia -width = 1920 -height = 1080 -formats = 0x219 -overwriteFormat = 0x820 overwriteWidth = 640 overwriteHeight = 360 [TextureRedefine] # half-res width = 960 height = 540 -overwriteWidth = 320 -overwriteHeight = 180 +overwriteWidth = +overwriteHeight = [TextureRedefine] # q-res width = 480 height = 270 -overwriteWidth = 160 -overwriteHeight = 90 +overwriteWidth = +overwriteHeight = [TextureRedefine] # o-res width = 240 height = 135 -overwriteWidth = 80 -overwriteHeight = 45 +overwriteWidth = +overwriteHeight = [TextureRedefine] # half-res 2 width = 120 height = 67 -overwriteWidth = 40 -overwriteHeight = 22 +overwriteWidth = +overwriteHeight = [TextureRedefine] # q-res 2 width = 60 height = 33 -overwriteWidth = 20 -overwriteHeight = 11 +overwriteWidth = +overwriteHeight = [TextureRedefine] # o-res 2 width = 30 height = 16 -overwriteWidth = 10 -overwriteHeight = 5 +overwriteWidth = +overwriteHeight = [TextureRedefine] # o-res 3 width = 8 height = 1 -overwriteWidth = 2 -overwriteHeight = 1 +overwriteWidth = +overwriteHeight = [TextureRedefine] # 2nd width = 820 diff --git a/Performance/Smash_540p/rules.txt b/Performance/Smash_540p/rules.txt index b8c2a338..b04abc45 100644 --- a/Performance/Smash_540p/rules.txt +++ b/Performance/Smash_540p/rules.txt @@ -5,15 +5,6 @@ name = "Super Smash Bros. - 540p" [TextureRedefine] # tv width = 1920 height = 1080 -formatsExcluded = 0x219 -overwriteWidth = 960 -overwriteHeight = 540 - -[TextureRedefine] # nvidia -width = 1920 -height = 1080 -formats = 0x219 -overwriteFormat = 0x820 overwriteWidth = 960 overwriteHeight = 540 diff --git a/Performance/Smash_720p/rules.txt b/Performance/Smash_720p/rules.txt index aaa0bad3..6c30cc97 100644 --- a/Performance/Smash_720p/rules.txt +++ b/Performance/Smash_720p/rules.txt @@ -5,15 +5,6 @@ name = "Super Smash Bros. - 720p" [TextureRedefine] # tv width = 1920 height = 1080 -formatsExcluded = 0x219 -overwriteWidth = 1280 -overwriteHeight = 720 - -[TextureRedefine] # nvidia -width = 1920 -height = 1080 -formats = 0x219 -overwriteFormat = 0x820 overwriteWidth = 1280 overwriteHeight = 720 diff --git a/Quality/Smash_1440p/rules.txt b/Quality/Smash_1440p/rules.txt index 8aae723c..9709bf7c 100644 --- a/Quality/Smash_1440p/rules.txt +++ b/Quality/Smash_1440p/rules.txt @@ -5,15 +5,6 @@ name = "Super Smash Bros. - 1440p (2K)" [TextureRedefine] # tv width = 1920 height = 1080 -formatsExcluded = 0x219 -overwriteWidth = 2560 -overwriteHeight = 1440 - -[TextureRedefine] # nvidia -width = 1920 -height = 1080 -formats = 0x219 -overwriteFormat = 0x820 overwriteWidth = 2560 overwriteHeight = 1440 diff --git a/Quality/Smash_2160p/rules.txt b/Quality/Smash_2160p/rules.txt index 6c62cba3..2e2c4e40 100644 --- a/Quality/Smash_2160p/rules.txt +++ b/Quality/Smash_2160p/rules.txt @@ -5,15 +5,6 @@ name = "Super Smash Bros. - 2160p (4K)" [TextureRedefine] # tv width = 1920 height = 1080 -formatsExcluded = 0x219 -overwriteWidth = 3840 -overwriteHeight = 2160 - -[TextureRedefine] # nvidia -width = 1920 -height = 1080 -formats = 0x219 -overwriteFormat = 0x820 overwriteWidth = 3840 overwriteHeight = 2160 diff --git a/Workaround/Smash_SNORMNVIDIA/rules.txt b/Workaround/Smash_SNORMNVIDIA/rules.txt new file mode 100644 index 00000000..c1c3bb75 --- /dev/null +++ b/Workaround/Smash_SNORMNVIDIA/rules.txt @@ -0,0 +1,10 @@ +#Made by Exzap himself, comes included with Cemu 1.7.4+ +[Definition] +titleIds = 0005000010145000,0005000010144F00,0005000010110E00 +name = "Super Smash Bros. - NVIDIA Brightness Fix (Experimental)" + +[TextureRedefine] # replace SNORM framebuffer with float format (On Nvidia, rendering to SNORM textures truncates colors to [0.0,1.0] range, despite SNORM supporting [-1.0,1.0] range) +width = 1920 +height = 1080 +formats = 0x219 # R10_G10_B10_A2_SNORM +overwriteFormat = 0x820 # R16_G16_B16_A16_FLOAT \ No newline at end of file