From 9aa46e85433998ea77d71c7c484ae0d86d750f91 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 31 Dec 2022 12:53:30 +1000 Subject: [PATCH] Misc: Remove GS/config.h include from PCSX2Base.h Also remove unused options from config.h --- pcsx2/GS/Renderers/SW/GSDrawScanline.h | 9 +++++---- pcsx2/GS/Renderers/SW/GSRasterizer.h | 3 ++- pcsx2/GS/config.h | 4 +--- pcsx2/PCSX2Base.h | 1 - 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pcsx2/GS/Renderers/SW/GSDrawScanline.h b/pcsx2/GS/Renderers/SW/GSDrawScanline.h index 819e1f8dcd..17909db0ad 100644 --- a/pcsx2/GS/Renderers/SW/GSDrawScanline.h +++ b/pcsx2/GS/Renderers/SW/GSDrawScanline.h @@ -16,10 +16,11 @@ #pragma once #include "GS/GSState.h" -#include "GSRasterizer.h" -#include "GSScanlineEnvironment.h" -#include "GSSetupPrimCodeGenerator.h" -#include "GSDrawScanlineCodeGenerator.h" +#include "GS/Renderers/SW/GSRasterizer.h" +#include "GS/Renderers/SW/GSScanlineEnvironment.h" +#include "GS/Renderers/SW/GSSetupPrimCodeGenerator.h" +#include "GS/Renderers/SW/GSDrawScanlineCodeGenerator.h" +#include "GS/config.h" MULTI_ISA_UNSHARED_START diff --git a/pcsx2/GS/Renderers/SW/GSRasterizer.h b/pcsx2/GS/Renderers/SW/GSRasterizer.h index 792900110b..6074ae8c5f 100644 --- a/pcsx2/GS/Renderers/SW/GSRasterizer.h +++ b/pcsx2/GS/Renderers/SW/GSRasterizer.h @@ -15,13 +15,14 @@ #pragma once -#include "GSVertexSW.h" +#include "GS/Renderers/SW/GSVertexSW.h" #include "GS/Renderers/Common/GSFunctionMap.h" #include "GS/GSAlignedClass.h" #include "GS/GSPerfMon.h" #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 index 5910d29f60..8604c0ffcf 100644 --- a/pcsx2/GS/config.h +++ b/pcsx2/GS/config.h @@ -16,9 +16,7 @@ #pragma once //#define ENABLE_VTUNE -//#define ENABLE_ACCURATE_BUFFER_EMULATION + #define ENABLE_JIT_RASTERIZER //#define DISABLE_HW_TEXTURE_CACHE // Slow but fixes a lot of bugs - -//#define DISABLE_PERF_MON // Burn cycle for nothing in release mode diff --git a/pcsx2/PCSX2Base.h b/pcsx2/PCSX2Base.h index a7d6d4ae46..2b47a7476e 100644 --- a/pcsx2/PCSX2Base.h +++ b/pcsx2/PCSX2Base.h @@ -19,7 +19,6 @@ #pragma once #include "common/Pcsx2Defs.h" -#include "GS/config.h" #if defined(__AVX2__) #define _M_SSE 0x501