From d8b107f59ca6f396462c094f7140d6eeb69b8d0d Mon Sep 17 00:00:00 2001 From: RedDevilus Date: Sun, 3 Apr 2022 19:08:56 +0200 Subject: [PATCH] PCSX2: Interlacing to Deinterlacing There are some more strings but don't want to mess around with too much --- .../validation/lint-gamedb/lint-gamedb.py | 4 +-- bin/docs/GameIndex.pdf | Bin 300275 -> 329800 bytes bin/resources/GameIndex.yaml | 16 ++++++------ pcsx2/Docs/GameIndex.md | 22 ++++++++-------- pcsx2/GS/GS.cpp | 24 +++++++++--------- pcsx2/GS/GS.h | 2 +- pcsx2/GS/Renderers/Common/GSRenderer.cpp | 2 +- pcsx2/GS/Window/GSwxDialog.cpp | 2 +- pcsx2/GameDatabase.cpp | 8 +++--- pcsx2/GameDatabase.h | 2 +- pcsx2/Pcsx2Config.cpp | 2 +- 11 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.github/workflows/scripts/validation/lint-gamedb/lint-gamedb.py b/.github/workflows/scripts/validation/lint-gamedb/lint-gamedb.py index 7aa0810361..37cf353e4a 100644 --- a/.github/workflows/scripts/validation/lint-gamedb/lint-gamedb.py +++ b/.github/workflows/scripts/validation/lint-gamedb/lint-gamedb.py @@ -58,7 +58,7 @@ allowed_gs_hw_fixes = [ "halfPixelOffset", "roundSprite", "texturePreloading", - "interlace", + "deinterlace", ] gs_hw_fix_ranges = { "mipmap": (0, 2), @@ -67,7 +67,7 @@ gs_hw_fix_ranges = { "skipDrawEnd": (0, 100000), "halfPixelOffset": (0, 3), "roundSprite": (0, 2), - "interlace": (0, 7), + "deinterlace": (0, 7), } allowed_speed_hacks = ["mvuFlagSpeedHack", "InstantVU1SpeedHack", "MTVUSpeedHack"] # Patches are allowed to have a 'default' key or a crc-32 key, followed by diff --git a/bin/docs/GameIndex.pdf b/bin/docs/GameIndex.pdf index 132d8af5bdc14c0c1ab53863c7ac27d46b810066..1f5d7bd097bc9a2140a3b25d4d1104f4ed9487ef 100644 GIT binary patch delta 28015 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 delta 17 ZcmX>xLFDsFp@tU57N!>FEi9j>002dp2W$WU diff --git a/bin/resources/GameIndex.yaml b/bin/resources/GameIndex.yaml index 191c4990d5..3387fb6c79 100644 --- a/bin/resources/GameIndex.yaml +++ b/bin/resources/GameIndex.yaml @@ -2748,7 +2748,7 @@ SCES-51164: name: "Mark of Kri, The" region: "PAL-M5" gsHWFixes: - interlace: 3 # Game requires bob delinterlacing when auto + deinterlace: 3 # Game requires bob deinterlacing when auto. SCES-51176: name: "Disney's Treasure Planet" region: "PAL-M4" @@ -6190,7 +6190,7 @@ SCUS-97140: region: "NTSC-U" compat: 5 gsHWFixes: - interlace: 3 # Game requires bob delinterlacing when auto + deinterlace: 3 # Game requires bob deinterlacing when auto. patches: DBD09DD4: content: |- @@ -6412,7 +6412,7 @@ SCUS-97201: name: "Mark of Kri, The" region: "NTSC-U" gsHWFixes: - interlace: 3 # Game requires bob delinterlacing when auto + deinterlace: 3 # Game requires bob deinterlacing when auto. SCUS-97203: name: "Wild ARMs 3" region: "NTSC-U" @@ -6492,7 +6492,7 @@ SCUS-97222: name: "Mark of Kri [Demo]" region: "NTSC-U" gsHWFixes: - interlace: 3 # Game requires bob delinterlacing when auto + deinterlace: 3 # Game requires bob deinterlacing when auto. SCUS-97223: name: "NFL GameDay 2003 [Demo]" region: "NTSC-U" @@ -15829,7 +15829,7 @@ SLES-53621: region: "PAL-M5" compat: 5 gsHWFixes: - interlace: 3 # Game requires bob delinterlacing when auto + deinterlace: 3 # Game requires bob deinterlacing when auto. SLES-53623: name: "Spongebob SquarePants - Battle for Bikini Bottom" region: "PAL-F" @@ -24842,7 +24842,7 @@ SLPM-65310: name: "Mark of Kri, The" region: "NTSC-J" gsHWFixes: - interlace: 3 # Game requires bob delinterlacing when auto + deinterlace: 3 # Game requires bob deinterlacing when auto. SLPM-65311: name: "Violet no Atelier - Gramnad no Renkinjutsushi" region: "NTSC-J" @@ -28141,7 +28141,7 @@ SLPM-66327: name: "Wallace and Gromit - The Curse of the Were-Rabbit" region: "NTSC-J" gsHWFixes: - interlace: 3 # Game requires bob delinterlacing when auto + deinterlace: 3 # Game requires bob deinterlacing when auto. SLPM-66328: name: "Call of Duty 2 - Big Red One" region: "NTSC-J" @@ -41508,7 +41508,7 @@ SLUS-21312: region: "NTSC-U" compat: 5 gsHWFixes: - interlace: 3 # Game requires bob delinterlacing when auto + deinterlace: 3 # Game requires bob deinterlacing when auto. SLUS-21313: name: "Friends - The One with all the Trivia" region: "NTSC-U" diff --git a/pcsx2/Docs/GameIndex.md b/pcsx2/Docs/GameIndex.md index e8acc6dc55..df57b73687 100644 --- a/pcsx2/Docs/GameIndex.md +++ b/pcsx2/Docs/GameIndex.md @@ -141,21 +141,21 @@ The clamp modes are also numerically based. ### GS Hardware General Fixes -* conservativeFramebuffer [`0` or `1`] {Off or On} Default: On (`1`) -* texturePreloading [`0` or `1` or `2`] {None, Partial or Full Hash Cache} Default: None (`0`) -* interlace [Value between `0` to `7`] {Off, WeaveTFF, WeaveBFF, BobTFF, BobBFF, BlendTFF, BlendBFF, Automatic} Default: Automatic (No value, looks up GameDB) +* conservativeFramebuffer [`0` or `1`] {Off or On} Default: On (`1`) +* texturePreloading [`0` or `1` or `2`] {None, Partial or Full Hash Cache} Default: None (`0`) +* deinterlace [Value between `0` to `7`] {Off, WeaveTFF, WeaveBFF, BobTFF, BobBFF, BlendTFF, BlendBFF, Automatic} Default: Automatic (No value, looks up GameDB) ### GS Hardware Renderer Fixes -* autoFlush [`0` or `1`] {Off or On} Default: Off (`0`) -* disableDepthSupport [`0` or `1`] {Off or On} Default: Off (`0`) +* autoFlush [`0` or `1`] {Off or On} Default: Off (`0`) +* disableDepthSupport [`0` or `1`] {Off or On} Default: Off (`0`) * disablePartialInvalidation [`0` or `1`] {Off or On} Default: Off (`0`) -* cpuFramebufferConversion [`0` or `1`] {Off or On} Default: Off (`0`) -* wrapGSMem [`0` or `1`] {Off or On} Default: Off (`0`) -* preloadFrameData [`0` or `1`] {Off or On} Default: Off (`0`) -* textureInsideRT [`0` or `1`] {Off or On} Default: Off (`0`) -* halfBottomOverride [`0` or `1`] {Force-Disabled or Force-Enabled} Default: Automatic (No value, looks up GameDB) -* pointListPalette [`0` or `1`] {Off or On} Default: Off (`0`) +* cpuFramebufferConversion [`0` or `1`] {Off or On} Default: Off (`0`) +* wrapGSMem [`0` or `1`] {Off or On} Default: Off (`0`) +* preloadFrameData [`0` or `1`] {Off or On} Default: Off (`0`) +* textureInsideRT [`0` or `1`] {Off or On} Default: Off (`0`) +* halfBottomOverride [`0` or `1`] {Force-Disabled or Force-Enabled} Default: Automatic (No value, looks up GameDB) +* pointListPalette [`0` or `1`] {Off or On} Default: Off (`0`) ### GS Hardware Upscaling Fixes diff --git a/pcsx2/GS/GS.cpp b/pcsx2/GS/GS.cpp index af0333652e..875cf52005 100644 --- a/pcsx2/GS/GS.cpp +++ b/pcsx2/GS/GS.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team + * Copyright (C) 2002-2022 PCSX2 Dev Team * * PCSX2 is free software: you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Found- @@ -718,7 +718,7 @@ void GSgetTitleStats(std::string& info) { const char* api_name = HostDisplay::RenderAPIToString(s_render_api); const char* hw_sw_name = (GSConfig.Renderer == GSRendererType::Null) ? " Null" : (GSConfig.UseHardwareRenderer() ? " HW" : " SW"); - const char* deinterlace_mode = theApp.m_gs_interlace[static_cast(GSConfig.InterlaceMode)].name.c_str(); + const char* deinterlace_mode = theApp.m_gs_deinterlace[static_cast(GSConfig.InterlaceMode)].name.c_str(); #ifndef PCSX2_CORE int iwidth, iheight; @@ -1209,14 +1209,14 @@ void GSApp::Init() // The null renderer goes last, it has use for benchmarking purposes in a release build m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::Null), "Null", "")); - m_gs_interlace.push_back(GSSetting(0, "None", "")); - m_gs_interlace.push_back(GSSetting(1, "Weave tff", "saw-tooth")); - m_gs_interlace.push_back(GSSetting(2, "Weave bff", "saw-tooth")); - m_gs_interlace.push_back(GSSetting(3, "Bob tff", "use blend if shaking")); - m_gs_interlace.push_back(GSSetting(4, "Bob bff", "use blend if shaking")); - m_gs_interlace.push_back(GSSetting(5, "Blend tff", "slight blur, 1/2 fps")); - m_gs_interlace.push_back(GSSetting(6, "Blend bff", "slight blur, 1/2 fps")); - m_gs_interlace.push_back(GSSetting(7, "Automatic", "Default")); + m_gs_deinterlace.push_back(GSSetting(0, "None", "")); + m_gs_deinterlace.push_back(GSSetting(1, "Weave tff", "saw-tooth")); + m_gs_deinterlace.push_back(GSSetting(2, "Weave bff", "saw-tooth")); + m_gs_deinterlace.push_back(GSSetting(3, "Bob tff", "use blend if shaking")); + m_gs_deinterlace.push_back(GSSetting(4, "Bob bff", "use blend if shaking")); + m_gs_deinterlace.push_back(GSSetting(5, "Blend tff", "slight blur, 1/2 fps")); + m_gs_deinterlace.push_back(GSSetting(6, "Blend bff", "slight blur, 1/2 fps")); + m_gs_deinterlace.push_back(GSSetting(7, "Automatic", "Default")); m_gs_upscale_multiplier.push_back(GSSetting(1, "Native", "PS2")); m_gs_upscale_multiplier.push_back(GSSetting(2, "2x Native", "~720p")); @@ -1339,7 +1339,7 @@ void GSApp::Init() m_default_configuration["fxaa"] = "0"; m_default_configuration["HWDisableReadbacks"] = "0"; m_default_configuration["IntegerScaling"] = "0"; - m_default_configuration["interlace"] = "7"; + m_default_configuration["deinterlace"] = "7"; m_default_configuration["conservative_framebuffer"] = "1"; m_default_configuration["linear_present"] = "1"; m_default_configuration["LoadTextureReplacements"] = "0"; @@ -1627,7 +1627,7 @@ BEGIN_HOTKEY_LIST(g_gs_hotkeys){ s_gs->PurgePool(); }); }}, - {"CycleInterlaceMode", "Graphics", "Cycle Interlace Mode", [](bool pressed) { + {"CycleInterlaceMode", "Graphics", "Cycle Deinterlace Mode", [](bool pressed) { if (pressed) return; diff --git a/pcsx2/GS/GS.h b/pcsx2/GS/GS.h index 7816248cae..f4d01d1afa 100644 --- a/pcsx2/GS/GS.h +++ b/pcsx2/GS/GS.h @@ -127,7 +127,7 @@ public: void SetConfigDir(); std::vector m_gs_renderers; - std::vector m_gs_interlace; + std::vector m_gs_deinterlace; std::vector m_gs_upscale_multiplier; std::vector m_gs_max_anisotropy; std::vector m_gs_dithering; diff --git a/pcsx2/GS/Renderers/Common/GSRenderer.cpp b/pcsx2/GS/Renderers/Common/GSRenderer.cpp index 88f9ce6673..8c877b0d28 100644 --- a/pcsx2/GS/Renderers/Common/GSRenderer.cpp +++ b/pcsx2/GS/Renderers/Common/GSRenderer.cpp @@ -643,7 +643,7 @@ void GSRenderer::KeyEvent(const HostKeyEvent& e) case VK_F5: GSConfig.InterlaceMode = static_cast((static_cast(GSConfig.InterlaceMode) + static_cast(GSInterlaceMode::Count) + step) % static_cast(GSInterlaceMode::Count)); theApp.SetConfig("interlace", static_cast(GSConfig.InterlaceMode)); - printf("GS: Set deinterlace mode to %d (%s).\n", static_cast(GSConfig.InterlaceMode), theApp.m_gs_interlace.at(static_cast(GSConfig.InterlaceMode)).name.c_str()); + printf("GS: Set deinterlace mode to %d (%s).\n", static_cast(GSConfig.InterlaceMode), theApp.m_gs_deinterlace.at(static_cast(GSConfig.InterlaceMode)).name.c_str()); return; case VK_DELETE: GSConfig.AA1 = !GSConfig.AA1; diff --git a/pcsx2/GS/Window/GSwxDialog.cpp b/pcsx2/GS/Window/GSwxDialog.cpp index 0d27224cf4..9c93288016 100644 --- a/pcsx2/GS/Window/GSwxDialog.cpp +++ b/pcsx2/GS/Window/GSwxDialog.cpp @@ -617,7 +617,7 @@ Dialog::Dialog() m_adapter_select = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, {}); top_grid->Add(m_adapter_select, wxSizerFlags().Expand()); - m_ui.addComboBoxAndLabel(top_grid, "Deinterlacing (F5):", "interlace", &theApp.m_gs_interlace); + m_ui.addComboBoxAndLabel(top_grid, "Deinterlacing (F5):", "deinterlace", &theApp.m_gs_deinterlace); m_bifilter_select = m_ui.addComboBoxAndLabel(top_grid, "Texture Filtering:", "filter", &theApp.m_gs_bifilter, IDC_FILTER).first; diff --git a/pcsx2/GameDatabase.cpp b/pcsx2/GameDatabase.cpp index 6b9b54b6d3..e4b7b6440d 100644 --- a/pcsx2/GameDatabase.cpp +++ b/pcsx2/GameDatabase.cpp @@ -286,7 +286,7 @@ static const char* s_gs_hw_fix_names[] = { "halfPixelOffset", "roundSprite", "texturePreloading", - "interlace", + "deinterlace", }; static_assert(std::size(s_gs_hw_fix_names) == static_cast(GameDatabaseSchema::GSHWFixId::Count), "HW fix name lookup is correct size"); @@ -310,7 +310,7 @@ bool GameDatabaseSchema::isUserHackHWFix(GSHWFixId id) { switch (id) { - case GSHWFixId::Interlace: + case GSHWFixId::Deinterlace: case GSHWFixId::Mipmap: case GSHWFixId::TexturePreloading: case GSHWFixId::ConservativeFramebuffer: @@ -552,13 +552,13 @@ u32 GameDatabaseSchema::GameEntry::applyGSHardwareFixes(Pcsx2Config::GSOptions& } break; - case GSHWFixId::Interlace: + case GSHWFixId::Deinterlace: if (value >= 0 && value <= static_cast(GSInterlaceMode::Automatic)) { if (config.InterlaceMode == GSInterlaceMode::Automatic) config.InterlaceMode = static_cast(value); else - Console.Warning("[GameDB] Game requires different interlace mode but it has been overridden by user setting."); + Console.Warning("[GameDB] Game requires different deinterlace mode but it has been overridden by user setting."); } break; diff --git a/pcsx2/GameDatabase.h b/pcsx2/GameDatabase.h index 185dbadc75..2a1d724362 100644 --- a/pcsx2/GameDatabase.h +++ b/pcsx2/GameDatabase.h @@ -81,7 +81,7 @@ namespace GameDatabaseSchema HalfPixelOffset, RoundSprite, TexturePreloading, - Interlace, + Deinterlace, Count }; diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp index e66def5957..2a3d2a9988 100644 --- a/pcsx2/Pcsx2Config.cpp +++ b/pcsx2/Pcsx2Config.cpp @@ -552,7 +552,7 @@ void Pcsx2Config::GSOptions::ReloadIniSettings() GSSettingBoolEx(LoadTextureReplacementsAsync, "LoadTextureReplacementsAsync"); GSSettingBoolEx(PrecacheTextureReplacements, "PrecacheTextureReplacements"); - GSSettingIntEnumEx(InterlaceMode, "interlace"); + GSSettingIntEnumEx(InterlaceMode, "deinterlace"); GSSettingFloat(OsdScale);