diff --git a/pcsx2/GS/GSdx.rc b/pcsx2/GS/GS.rc similarity index 100% rename from pcsx2/GS/GSdx.rc rename to pcsx2/GS/GS.rc diff --git a/pcsx2/GS/GSdx.def b/pcsx2/GS/GSdx.def deleted file mode 100644 index 7a57f5d8fb..0000000000 --- a/pcsx2/GS/GSdx.def +++ /dev/null @@ -1,46 +0,0 @@ -; GS.def : Declares the module parameters for the DLL. - -EXPORTS - ; Explicit exports can go here - PS2EgetLibType - PS2EgetLibName - PS2EgetLibVersion2 - PS2EgetCpuPlatform - GSsetBaseMem - GSinit - GSshutdown - GSosdLog - GSosdMonitor - GSopen - GSopen2 - GSclose - GSreset - GSwriteCSR - GSgifSoftReset - GSgifTransfer - GSgifTransfer1 - GSgifTransfer2 - GSgifTransfer3 - GSvsync - GSmakeSnapshot - GSkeyEvent - GSfreeze - GSconfigure - GStest - GSabout - GSinitReadFIFO - GSreadFIFO - GSinitReadFIFO2 - GSreadFIFO2 - GSirqCallback - GSsetupRecording - GSendRecording - GSsetGameCRC - GSsetFrameSkip - GSsetVsync - GSsetExclusive - GSsetSettingsDir - GSgetLastTag - GSReplay - GSBenchmark - GSgetTitleInfo2 diff --git a/pcsx2/GS/GSdx.h b/pcsx2/GS/GSdx.h deleted file mode 100644 index 140028eaa5..0000000000 --- a/pcsx2/GS/GSdx.h +++ /dev/null @@ -1,100 +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 - -#include "Window/GSSetting.h" -#include "GS.h" - -class GSApp -{ - std::string m_ini; - std::string m_section; - std::map m_default_configuration; - std::map m_configuration_map; - GSRendererType m_current_renderer_type; - -public: - GSApp(); - - void Init(); - void* GetModuleHandlePtr(); - -#ifdef _WIN32 - HMODULE GetModuleHandle() - { - return (HMODULE)GetModuleHandlePtr(); - } -#endif - - void BuildConfigurationMap(const char* lpFileName); - void ReloadConfig(); - - size_t GetIniString(const char* lpAppName, const char* lpKeyName, const char* lpDefault, char* lpReturnedString, size_t nSize, const char* lpFileName); - bool WriteIniString(const char* lpAppName, const char* lpKeyName, const char* pString, const char* lpFileName); - int GetIniInt(const char* lpAppName, const char* lpKeyName, int nDefault, const char* lpFileName); - -#ifdef _WIN32 - bool LoadResource(int id, std::vector& buff, const wchar_t* type = nullptr); -#else - bool LoadResource(int id, std::vector& buff, const char* type = nullptr); -#endif - - void SetConfig(const char* entry, const char* value); - void SetConfig(const char* entry, int value); - // Avoid issue with overloading - template - T GetConfigT(const char* entry) - { - return static_cast(GetConfigI(entry)); - } - int GetConfigI(const char* entry); - bool GetConfigB(const char* entry); - std::string GetConfigS(const char* entry); - - void SetCurrentRendererType(GSRendererType type); - GSRendererType GetCurrentRendererType() const; - - void SetConfigDir(const char* dir); - - std::vector m_gs_renderers; - std::vector m_gs_interlace; - std::vector m_gs_aspectratio; - std::vector m_gs_upscale_multiplier; - std::vector m_gs_max_anisotropy; - std::vector m_gs_dithering; - std::vector m_gs_bifilter; - std::vector m_gs_trifilter; - std::vector m_gs_hack; - std::vector m_gs_generic_list; - std::vector m_gs_offset_hack; - std::vector m_gs_hw_mipmapping; - std::vector m_gs_crc_level; - std::vector m_gs_acc_blend_level; - std::vector m_gs_acc_blend_level_d3d11; - std::vector m_gs_tv_shaders; -}; - -struct GSError -{ -}; -struct GSRecoverableError : GSError -{ -}; -struct GSErrorGlVertexArrayTooSmall : GSError -{ -}; - -extern GSApp theApp;