From da1b408f9727c57887d2770c97a71835200bceb4 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 25 Jan 2023 20:55:01 +1000 Subject: [PATCH] GS: Remove config.h It conflicts with the main PCSX2 Config.h, and the defines don't need to be set in the global namespace anymore. --- pcsx2/CMakeLists.txt | 1 - pcsx2/GS/GS.h | 2 -- pcsx2/GS/Renderers/HW/GSTextureCache.h | 4 ++++ pcsx2/GS/Renderers/SW/GSDrawScanline.cpp | 4 +++- pcsx2/GS/Renderers/SW/GSRasterizer.h | 1 - pcsx2/GS/config.h | 22 ---------------------- pcsx2/pcsx2core.vcxproj | 1 - pcsx2/pcsx2core.vcxproj.filters | 3 --- 8 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 pcsx2/GS/config.h diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index aabe691ce5..e22465a371 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -528,7 +528,6 @@ set(pcsx2GSSources # GS headers set(pcsx2GSHeaders - GS/config.h GS/GSAlignedClass.h GS/GSBlock.h GS/GSCapture.h diff --git a/pcsx2/GS/GS.h b/pcsx2/GS/GS.h index 11dfe35da0..a82b67000c 100644 --- a/pcsx2/GS/GS.h +++ b/pcsx2/GS/GS.h @@ -18,8 +18,6 @@ #include "common/WindowInfo.h" #include "SaveState.h" #include "pcsx2/Config.h" -#include "pcsx2/GS/config.h" -#include "gsl/span" #include #include diff --git a/pcsx2/GS/Renderers/HW/GSTextureCache.h b/pcsx2/GS/Renderers/HW/GSTextureCache.h index 0b722ac0e2..38253a9ac6 100644 --- a/pcsx2/GS/Renderers/HW/GSTextureCache.h +++ b/pcsx2/GS/Renderers/HW/GSTextureCache.h @@ -22,6 +22,10 @@ #include "GS/Renderers/Common/GSDirtyRect.h" #include +// Only for debugging. Reads back every target to local memory after drawing, effectively +// disabling caching between draws. +//#define DISABLE_HW_TEXTURE_CACHE + class GSTextureCache { public: diff --git a/pcsx2/GS/Renderers/SW/GSDrawScanline.cpp b/pcsx2/GS/Renderers/SW/GSDrawScanline.cpp index aca9d9cb81..1b1de5e332 100644 --- a/pcsx2/GS/Renderers/SW/GSDrawScanline.cpp +++ b/pcsx2/GS/Renderers/SW/GSDrawScanline.cpp @@ -18,7 +18,9 @@ #include "GS/Renderers/SW/GSTextureCacheSW.h" #include "GS/Renderers/SW/GSScanlineEnvironment.h" #include "GS/Renderers/SW/GSRasterizer.h" -#include "GS/config.h" + +// Comment to disable all dynamic code generation. +#define ENABLE_JIT_RASTERIZER #if MULTI_ISA_COMPILE_ONCE // Lack of a better home diff --git a/pcsx2/GS/Renderers/SW/GSRasterizer.h b/pcsx2/GS/Renderers/SW/GSRasterizer.h index d9492fd4a9..1091a0f1d9 100644 --- a/pcsx2/GS/Renderers/SW/GSRasterizer.h +++ b/pcsx2/GS/Renderers/SW/GSRasterizer.h @@ -22,7 +22,6 @@ #include "GS/GSThread_CXX11.h" #include "GS/GSRingHeap.h" #include "GS/MultiISA.h" -#include "GS/config.h" MULTI_ISA_UNSHARED_START diff --git a/pcsx2/GS/config.h b/pcsx2/GS/config.h deleted file mode 100644 index 8604c0ffcf..0000000000 --- a/pcsx2/GS/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 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- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -//#define ENABLE_VTUNE - -#define ENABLE_JIT_RASTERIZER - -//#define DISABLE_HW_TEXTURE_CACHE // Slow but fixes a lot of bugs diff --git a/pcsx2/pcsx2core.vcxproj b/pcsx2/pcsx2core.vcxproj index 3b4d4dcdc9..0fa426b435 100644 --- a/pcsx2/pcsx2core.vcxproj +++ b/pcsx2/pcsx2core.vcxproj @@ -605,7 +605,6 @@ - diff --git a/pcsx2/pcsx2core.vcxproj.filters b/pcsx2/pcsx2core.vcxproj.filters index 3267264c50..7f72e13342 100644 --- a/pcsx2/pcsx2core.vcxproj.filters +++ b/pcsx2/pcsx2core.vcxproj.filters @@ -1942,9 +1942,6 @@ System\Ps2\GS - - System\Ps2\GS - System\Ps2\GS