mirror of https://github.com/PCSX2/pcsx2.git
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.
This commit is contained in:
parent
91c3e3b684
commit
da1b408f97
|
@ -528,7 +528,6 @@ set(pcsx2GSSources
|
|||
|
||||
# GS headers
|
||||
set(pcsx2GSHeaders
|
||||
GS/config.h
|
||||
GS/GSAlignedClass.h
|
||||
GS/GSBlock.h
|
||||
GS/GSCapture.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 <map>
|
||||
#include <string>
|
||||
|
|
|
@ -22,6 +22,10 @@
|
|||
#include "GS/Renderers/Common/GSDirtyRect.h"
|
||||
#include <unordered_set>
|
||||
|
||||
// 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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
//#define ENABLE_VTUNE
|
||||
|
||||
#define ENABLE_JIT_RASTERIZER
|
||||
|
||||
//#define DISABLE_HW_TEXTURE_CACHE // Slow but fixes a lot of bugs
|
|
@ -605,7 +605,6 @@
|
|||
<ClInclude Include="SPU2\regs.h" />
|
||||
<ClInclude Include="SPU2\Mixer.h" />
|
||||
<ClInclude Include="SPU2\spu2.h" />
|
||||
<ClInclude Include="GS\config.h" />
|
||||
<ClInclude Include="GS\Renderers\OpenGL\GLLoader.h" />
|
||||
<ClInclude Include="GS\Renderers\OpenGL\GLState.h" />
|
||||
<ClInclude Include="GS\GS.h" />
|
||||
|
|
|
@ -1942,9 +1942,6 @@
|
|||
<ClInclude Include="GS\MultiISA.h">
|
||||
<Filter>System\Ps2\GS</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="GS\config.h">
|
||||
<Filter>System\Ps2\GS</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="GS\GSPng.h">
|
||||
<Filter>System\Ps2\GS</Filter>
|
||||
</ClInclude>
|
||||
|
|
Loading…
Reference in New Issue