From 3ed603074c98d02b3fd7004d24b75433aefaa907 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Tue, 22 Dec 2015 22:24:35 +0300 Subject: [PATCH] Changes done by [DH] rewritten Added rsx_program_decompiler submodule Added fs::dir iterator Added fmt::match --- .gitmodules | 3 + .travis.yml | 2 +- Utilities/File.cpp | 18 ++++ Utilities/File.h | 72 ++++++++++++++ Utilities/StrFmt.cpp | 39 ++++++++ Utilities/StrFmt.h | 1 + appveyor.yml | 2 +- rpcs3.sln | 40 +++++++- rpcs3/CMakeLists.txt | 4 + rpcs3/Crypto/unedat.cpp | 2 - rpcs3/Crypto/unpkg.cpp | 2 - rpcs3/Crypto/unself.cpp | 2 - rpcs3/Emu/ARMv7/ARMv7Decoder.cpp | 1 - rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp | 1 - rpcs3/Emu/ARMv7/ARMv7Thread.cpp | 1 - rpcs3/Emu/ARMv7/Modules/sceLibc.cpp | 1 - rpcs3/Emu/Audio/AL/OpenALThread.cpp | 1 - rpcs3/Emu/Audio/AudioDumper.h | 1 - rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp | 1 - rpcs3/Emu/CPU/CPUThread.cpp | 1 - rpcs3/Emu/Cell/PPUInterpreter.cpp | 1 - rpcs3/Emu/Cell/PPULLVMRecompiler.cpp | 1 - rpcs3/Emu/Cell/PPULLVMRecompilerCore.cpp | 1 - rpcs3/Emu/Cell/PPUProgramCompiler.cpp | 1 - rpcs3/Emu/Cell/PPUThread.cpp | 1 - rpcs3/Emu/Cell/RawSPUThread.cpp | 1 - rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp | 2 - rpcs3/Emu/Cell/SPUAnalyser.cpp | 1 - rpcs3/Emu/Cell/SPUInterpreter.cpp | 1 - rpcs3/Emu/Cell/SPURecompiler.cpp | 1 - rpcs3/Emu/Cell/SPUThread.cpp | 1 - rpcs3/Emu/FS/VFS.cpp | 1 - rpcs3/Emu/FS/vfsDirBase.cpp | 1 - rpcs3/Emu/FS/vfsLocalDir.h | 1 - rpcs3/Emu/FS/vfsLocalFile.cpp | 1 - rpcs3/Emu/FS/vfsStream.h | 2 - rpcs3/Emu/HDD/HDD.cpp | 1 - rpcs3/Emu/Io/XInput/XInputPadHandler.cpp | 1 - rpcs3/Emu/Memory/Memory.cpp | 1 - rpcs3/Emu/Memory/MemoryBlock.h | 2 - rpcs3/Emu/Memory/vm.cpp | 1 - rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp | 1 - rpcs3/Emu/RSX/CgBinaryProgram.h | 2 - rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp | 1 - rpcs3/Emu/RSX/Common/BufferUtils.cpp | 1 - .../RSX/Common/FragmentProgramDecompiler.cpp | 1 - rpcs3/Emu/RSX/Common/ProgramStateCache.h | 1 - rpcs3/Emu/RSX/Common/TextureUtils.cpp | 1 - .../RSX/Common/VertexProgramDecompiler.cpp | 1 - rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp | 1 - .../D3D12/D3D12FragmentProgramDecompiler.cpp | 1 - rpcs3/Emu/RSX/D3D12/D3D12GSRender.h | 2 - rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h | 1 - rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp | 2 - rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp | 1 - rpcs3/Emu/RSX/D3D12/D3D12Utils.h | 1 - .../D3D12/D3D12VertexProgramDecompiler.cpp | 1 - rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp | 1 - rpcs3/Emu/RSX/GL/GLGSRender.cpp | 3 +- rpcs3/Emu/RSX/GL/GLProgramBuffer.h | 1 - rpcs3/Emu/RSX/GL/GLVertexProgram.cpp | 1 - rpcs3/Emu/RSX/GL/OpenGL.cpp | 1 - rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp | 1 - rpcs3/Emu/RSX/GSManager.cpp | 1 - rpcs3/Emu/RSX/RSXThread.cpp | 65 ++++++++++++- rpcs3/Emu/RSX/RSXThread.h | 93 +++++++++++++++++++ rpcs3/Emu/SysCalls/Callback.cpp | 1 - rpcs3/Emu/SysCalls/LogBase.cpp | 1 - rpcs3/Emu/SysCalls/Modules.cpp | 1 - rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp | 1 - rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp | 1 - rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp | 1 - rpcs3/Emu/SysCalls/Modules/libmixer.cpp | 1 - rpcs3/Emu/SysCalls/Modules/sceNp.cpp | 1 - rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp | 1 - rpcs3/Emu/SysCalls/Modules/sys_libc.cpp | 1 - rpcs3/Emu/SysCalls/SysCalls.cpp | 1 - rpcs3/Emu/SysCalls/lv2/sys_tty.cpp | 1 - rpcs3/Emu/System.cpp | 2 - rpcs3/Emu/events.h | 5 +- rpcs3/Gui/AutoPauseManager.cpp | 2 - rpcs3/Gui/ConLogFrame.cpp | 1 - rpcs3/Gui/GameViewer.cpp | 2 - rpcs3/Gui/GameViewer.h | 1 - rpcs3/Gui/InterpreterDisAsm.cpp | 1 - rpcs3/Gui/KernelExplorer.cpp | 1 - rpcs3/Gui/LLEModulesManager.cpp | 1 - rpcs3/Gui/MemoryStringSearcher.cpp | 1 - rpcs3/Gui/MemoryViewer.cpp | 1 - rpcs3/Gui/PADManager.cpp | 1 - rpcs3/Gui/RSXDebugger.cpp | 2 - rpcs3/Gui/SaveDataUtility.cpp | 2 - rpcs3/Gui/SettingsDialog.cpp | 2 - rpcs3/Gui/VFSManager.cpp | 1 - rpcs3/Gui/VHDDManager.cpp | 1 - rpcs3/Loader/ELF32.cpp | 1 - rpcs3/Loader/ELF64.cpp | 1 - rpcs3/Loader/Loader.cpp | 1 - rpcs3/Loader/PSF.cpp | 1 - rpcs3/Loader/TROPUSR.cpp | 1 - rpcs3/Loader/TRP.cpp | 1 - rpcs3/config.cpp | 2 - rpcs3/rpcs3.cpp | 1 - rpcs3/stdafx.h | 2 + rsx_program_decompiler | 1 + 105 files changed, 339 insertions(+), 117 deletions(-) create mode 160000 rsx_program_decompiler diff --git a/.gitmodules b/.gitmodules index a1d4cad25f..9b5f0cb968 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "minidx9"] path = minidx9 url = https://github.com/hrydgard/minidx9.git +[submodule "rsx_program_decompiler"] + path = rsx_program_decompiler + url = https://github.com/RPCS3/rsx_program_decompiler diff --git a/.travis.yml b/.travis.yml index df0a8a7c83..49bf22c063 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,7 @@ before_install: fi; before_script: - - git submodule update --init asmjit ffmpeg + - git submodule update --init asmjit ffmpeg rsx_program_decompiler - mkdir build - cd build - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ..; else cmake .. -DLLVM_DIR=/usr/local/opt/llvm36/lib/llvm-3.6/share/llvm/cmake; fi diff --git a/Utilities/File.cpp b/Utilities/File.cpp index a32366cefa..5d650dc77a 100644 --- a/Utilities/File.cpp +++ b/Utilities/File.cpp @@ -797,6 +797,24 @@ bool fs::dir::read(std::string& name, stat_t& info) return true; } +bool fs::dir::first(std::string& name, stat_t& info) +{ +#ifdef _WIN32 + if (m_path && m_dd != -1) + { + CHECK_ASSERTION(FindClose((HANDLE)m_dd)); + m_dd = -1; + } +#else + if (m_path) + { + ::rewinddir((DIR*)m_dd); + } +#endif + + return read(name, info); +} + std::string fs::get_config_dir() { // Use magic static for dir initialization diff --git a/Utilities/File.h b/Utilities/File.h index 7398baab23..0fcb3c30a7 100644 --- a/Utilities/File.h +++ b/Utilities/File.h @@ -289,6 +289,78 @@ namespace fs // Get next directory entry (UTF-8 name and file stat) bool read(std::string& name, stat_t& info); + + bool first(std::string& name, stat_t& info); + + struct entry + { + std::string name; + stat_t info; + }; + + class iterator + { + entry m_entry; + dir* m_parent; + + public: + enum class mode + { + from_first, + from_current + }; + + iterator(dir* parent, mode mode_ = mode::from_first) + : m_parent(parent) + { + if (!m_parent) + { + return; + } + + bool is_ok; + + if (mode_ == mode::from_first) + { + is_ok = m_parent->first(m_entry.name, m_entry.info); + } + else + { + is_ok = m_parent->read(m_entry.name, m_entry.info); + } + + if (!is_ok) + { + m_parent = nullptr; + } + } + + entry& operator *() + { + return m_entry; + } + + iterator& operator++() + { + *this = { m_parent, mode::from_current }; + return *this; + } + + bool operator !=(const iterator& rhs) const + { + return m_parent != rhs.m_parent; + } + }; + + iterator begin() + { + return{ this }; + } + + iterator end() + { + return{ nullptr }; + } }; // Get configuration directory diff --git a/Utilities/StrFmt.cpp b/Utilities/StrFmt.cpp index f98e20f39e..8e67616579 100644 --- a/Utilities/StrFmt.cpp +++ b/Utilities/StrFmt.cpp @@ -259,3 +259,42 @@ std::string fmt::escape(std::string source) return source; } + +bool fmt::match(const std::string &source, const std::string &mask) +{ + std::size_t source_position = 0, mask_position = 0; + + for (; source_position < source.size() && mask_position < mask.size(); ++mask_position, ++source_position) + { + switch (mask[mask_position]) + { + case '?': break; + + case '*': + for (std::size_t test_source_position = source_position; test_source_position < source.size(); ++test_source_position) + { + if (match(source.substr(test_source_position), mask.substr(mask_position + 1))) + { + return true; + } + } + return false; + + default: + if (source[source_position] != mask[mask_position]) + { + return false; + } + + break; + } + } + + if (source_position != source.size()) + return false; + + if (mask_position != mask.size()) + return false; + + return true; +} diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h index d40a0b722c..f694e4d79f 100644 --- a/Utilities/StrFmt.h +++ b/Utilities/StrFmt.h @@ -354,4 +354,5 @@ namespace fmt std::string tolower(std::string source); std::string toupper(std::string source); std::string escape(std::string source); + bool match(const std::string &source, const std::string &mask); } diff --git a/appveyor.yml b/appveyor.yml index 871097f07d..4be75cb05f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,7 @@ branches: before_build: # until git for win 2.5 release with commit checkout - - git submodule update --init ffmpeg asmjit minidx9 + - git submodule update --init ffmpeg asmjit minidx9 rsx_program_decompiler - 7z x wxWidgets.7z -aos -oC:\rpcs3\wxWidgets > null - if %configuration%==Release (cmake -G "Visual Studio 14 Win64") else (7z x llvmlibs.7z -aos -oC:\rpcs3 > null && cmake -G "Visual Studio 14 Win64" -DLLVM_DIR=C:/rpcs3/llvm_build/share/llvm/cmake) diff --git a/rpcs3.sln b/rpcs3.sln index a92db41391..6bdd5a94cf 100644 --- a/rpcs3.sln +++ b/rpcs3.sln @@ -195,6 +195,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3-tests", "rpcs3-tests\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLGSRender", "rpcs3\GLGSRender.vcxproj", "{3384223A-6D97-4799-9862-359F85312892}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "rpcs3.emu", "rpcs3.emu", "{10FBF193-D532-4CCF-B875-4C7091A7F6C2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shader_code", "rsx_program_decompiler\shader_code\shader_code.vcxproj", "{97E17077-A21F-45EF-9C3A-73A0BC092D7E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsx_decompiler", "rsx_program_decompiler\rsx_decompiler\rsx_decompiler.vcxproj", "{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug - LLVM|x64 = Debug - LLVM|x64 @@ -638,6 +644,34 @@ Global {3384223A-6D97-4799-9862-359F85312892}.Release - LLVM|x64.Build.0 = Release - LLVM|x64 {3384223A-6D97-4799-9862-359F85312892}.Release|x64.ActiveCfg = Release|x64 {3384223A-6D97-4799-9862-359F85312892}.Release|x64.Build.0 = Release|x64 + {97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Debug - LLVM|x64.ActiveCfg = Debug|x64 + {97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Debug - LLVM|x64.Build.0 = Debug|x64 + {97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Debug - MemLeak|x64.ActiveCfg = Debug|x64 + {97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Debug - MemLeak|x64.Build.0 = Debug|x64 + {97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Debug|x64.ActiveCfg = Debug|x64 + {97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Debug|x64.Build.0 = Debug|x64 + {97E17077-A21F-45EF-9C3A-73A0BC092D7E}.DLL Debug|x64.ActiveCfg = Debug|x64 + {97E17077-A21F-45EF-9C3A-73A0BC092D7E}.DLL Debug|x64.Build.0 = Debug|x64 + {97E17077-A21F-45EF-9C3A-73A0BC092D7E}.DLL Release|x64.ActiveCfg = Release|x64 + {97E17077-A21F-45EF-9C3A-73A0BC092D7E}.DLL Release|x64.Build.0 = Release|x64 + {97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Release - LLVM|x64.ActiveCfg = Release|x64 + {97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Release - LLVM|x64.Build.0 = Release|x64 + {97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Release|x64.ActiveCfg = Release|x64 + {97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Release|x64.Build.0 = Release|x64 + {7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Debug - LLVM|x64.ActiveCfg = Debug|x64 + {7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Debug - LLVM|x64.Build.0 = Debug|x64 + {7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Debug - MemLeak|x64.ActiveCfg = Debug|x64 + {7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Debug - MemLeak|x64.Build.0 = Debug|x64 + {7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Debug|x64.ActiveCfg = Debug|x64 + {7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Debug|x64.Build.0 = Debug|x64 + {7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.DLL Debug|x64.ActiveCfg = Debug|x64 + {7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.DLL Debug|x64.Build.0 = Debug|x64 + {7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.DLL Release|x64.ActiveCfg = Release|x64 + {7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.DLL Release|x64.Build.0 = Release|x64 + {7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Release - LLVM|x64.ActiveCfg = Release|x64 + {7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Release - LLVM|x64.Build.0 = Release|x64 + {7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Release|x64.ActiveCfg = Release|x64 + {7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -666,10 +700,12 @@ Global {23E1C437-A951-5943-8639-A17F3CF2E606} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} {74827EBD-93DC-5110-BA95-3F2AB029B6B0} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} {AC40FF01-426E-4838-A317-66354CEFAE88} = {E2A982F2-4B1A-48B1-8D77-A17A589C58D7} + {C4A10229-4712-4BD2-B63E-50D93C67A038} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2} {8BC303AB-25BE-4276-8E57-73F171B2D672} = {C8068CE9-D626-4FEA-BEE7-893F06A25BF3} {01F4CE10-2CFB-41A8-B41F-E54337868A1D} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} {00D36322-6188-4A66-B514-3B3F183E998D} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} - {FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078} = {1A43FD7A-C7DD-4D04-A4D6-FAA194AAD9D2} - {3384223A-6D97-4799-9862-359F85312892} = {1A43FD7A-C7DD-4D04-A4D6-FAA194AAD9D2} + {FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2} + {3384223A-6D97-4799-9862-359F85312892} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2} + {7D73447B-3D2D-4DFE-BF62-57E644C1D09F} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2} EndGlobalSection EndGlobal diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 85337df632..ef900b489d 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -112,6 +112,8 @@ ${LLVM_INCLUDE_DIRS} "${RPCS3_SRC_DIR}/.." "${RPCS3_SRC_DIR}/../asmjit/src/asmjit" "${RPCS3_SRC_DIR}/../glm" +"${RPCS3_SRC_DIR}/../rsx_program_decompiler/rsx_decompiler" +"${RPCS3_SRC_DIR}/../rsx_program_decompiler/shader_code" ) if(WIN32) include_directories(BEFORE "${RPCS3_SRC_DIR}/../minidx9/Include") @@ -159,6 +161,8 @@ RPCS3_SRC "${RPCS3_SRC_DIR}/Loader/*" "${RPCS3_SRC_DIR}/Crypto/*" "${RPCS3_SRC_DIR}/../Utilities/*" +"${RPCS3_SRC_DIR}/../rsx_program_decompiler/rsx_decompiler/*" +"${RPCS3_SRC_DIR}/../rsx_program_decompiler/shader_code/*" ) add_executable(rpcs3 ${RPCS3_SRC}) diff --git a/rpcs3/Crypto/unedat.cpp b/rpcs3/Crypto/unedat.cpp index e6269544f3..8830ea9c3d 100644 --- a/rpcs3/Crypto/unedat.cpp +++ b/rpcs3/Crypto/unedat.cpp @@ -1,8 +1,6 @@ #include "stdafx.h" #include "key_vault.h" #include "unedat.h" -#include "Utilities/Log.h" -#include "Utilities/File.h" void generate_key(int crypto_mode, int version, unsigned char *key_final, unsigned char *iv_final, unsigned char *key, unsigned char *iv) { diff --git a/rpcs3/Crypto/unpkg.cpp b/rpcs3/Crypto/unpkg.cpp index 6e9f42c948..f4cda67604 100644 --- a/rpcs3/Crypto/unpkg.cpp +++ b/rpcs3/Crypto/unpkg.cpp @@ -1,6 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" -#include "Utilities/File.h" #include "utils.h" #include "aes.h" #include "sha1.h" diff --git a/rpcs3/Crypto/unself.cpp b/rpcs3/Crypto/unself.cpp index 9b3ca90edf..6fe7ce0e07 100644 --- a/rpcs3/Crypto/unself.cpp +++ b/rpcs3/Crypto/unself.cpp @@ -1,6 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" -#include "Utilities/File.h" #include "aes.h" #include "sha1.h" #include "utils.h" diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp index bf73953e2e..7fd3606b4d 100644 --- a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp +++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "ARMv7Thread.h" #include "ARMv7Interpreter.h" diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp index 076239720d..91a96411c3 100644 --- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp +++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/System.h" #include "Emu/Memory/Memory.h" #include "Emu/CPU/CPUDecoder.h" diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp index 8515ba5b4b..a7cae52e4d 100644 --- a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp +++ b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/state.h" diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp index 4c06ff6476..5bd6c83f5c 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/System.h" #include "Emu/ARMv7/PSVFuncList.h" #include "Emu/ARMv7/ARMv7Thread.h" diff --git a/rpcs3/Emu/Audio/AL/OpenALThread.cpp b/rpcs3/Emu/Audio/AL/OpenALThread.cpp index f56de68015..5569b6df05 100644 --- a/rpcs3/Emu/Audio/AL/OpenALThread.cpp +++ b/rpcs3/Emu/Audio/AL/OpenALThread.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/System.h" #include "Emu/state.h" diff --git a/rpcs3/Emu/Audio/AudioDumper.h b/rpcs3/Emu/Audio/AudioDumper.h index fa629b254d..9578b31b6f 100644 --- a/rpcs3/Emu/Audio/AudioDumper.h +++ b/rpcs3/Emu/Audio/AudioDumper.h @@ -1,5 +1,4 @@ #pragma once -#include "Utilities/File.h" struct WAVHeader { diff --git a/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp b/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp index ae384bc8b8..80483b6c35 100644 --- a/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp +++ b/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #ifdef _MSC_VER -#include "Utilities/Log.h" #include "Emu/System.h" #include "Emu/state.h" diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp index d847666a42..6bf842f73d 100644 --- a/rpcs3/Emu/CPU/CPUThread.cpp +++ b/rpcs3/Emu/CPU/CPUThread.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/IdManager.h" diff --git a/rpcs3/Emu/Cell/PPUInterpreter.cpp b/rpcs3/Emu/Cell/PPUInterpreter.cpp index 5cc29a4c39..0842b06ddb 100644 --- a/rpcs3/Emu/Cell/PPUInterpreter.cpp +++ b/rpcs3/Emu/Cell/PPUInterpreter.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/Cell/PPUThread.h" diff --git a/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp b/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp index de12adc8f2..26ccaf992c 100644 --- a/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp +++ b/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #ifdef LLVM_AVAILABLE -#include "Utilities/Log.h" #include "Emu/System.h" #include "Emu/state.h" #include "Emu/Cell/PPUDisAsm.h" diff --git a/rpcs3/Emu/Cell/PPULLVMRecompilerCore.cpp b/rpcs3/Emu/Cell/PPULLVMRecompilerCore.cpp index 319ce948c3..5ce08772d9 100644 --- a/rpcs3/Emu/Cell/PPULLVMRecompilerCore.cpp +++ b/rpcs3/Emu/Cell/PPULLVMRecompilerCore.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #ifdef LLVM_AVAILABLE -#include "Utilities/Log.h" #include "Emu/System.h" #include "Emu/Cell/PPULLVMRecompiler.h" #include "Emu/Memory/Memory.h" diff --git a/rpcs3/Emu/Cell/PPUProgramCompiler.cpp b/rpcs3/Emu/Cell/PPUProgramCompiler.cpp index c4c6d73814..26480c2cdb 100644 --- a/rpcs3/Emu/Cell/PPUProgramCompiler.cpp +++ b/rpcs3/Emu/Cell/PPUProgramCompiler.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "stdafx_gui.h" #include "PPUProgramCompiler.h" -#include "Utilities/File.h" /* using namespace PPU_instr; diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index 0b9ae73e0f..8e93e4cf97 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/state.h" diff --git a/rpcs3/Emu/Cell/RawSPUThread.cpp b/rpcs3/Emu/Cell/RawSPUThread.cpp index 5063ee63f0..8089a0b73a 100644 --- a/rpcs3/Emu/Cell/RawSPUThread.cpp +++ b/rpcs3/Emu/Cell/RawSPUThread.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/SysCalls/Callback.h" diff --git a/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp b/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp index bac5cae907..fc2e5aaf97 100644 --- a/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp +++ b/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp @@ -1,6 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" -#include "Utilities/File.h" #include "Emu/System.h" #include "SPUDisAsm.h" diff --git a/rpcs3/Emu/Cell/SPUAnalyser.cpp b/rpcs3/Emu/Cell/SPUAnalyser.cpp index b129a7b7bc..d8e063c7b2 100644 --- a/rpcs3/Emu/Cell/SPUAnalyser.cpp +++ b/rpcs3/Emu/Cell/SPUAnalyser.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Crypto/sha1.h" #include "SPURecompiler.h" diff --git a/rpcs3/Emu/Cell/SPUInterpreter.cpp b/rpcs3/Emu/Cell/SPUInterpreter.cpp index d4968b8bb7..0c669c37ac 100644 --- a/rpcs3/Emu/Cell/SPUInterpreter.cpp +++ b/rpcs3/Emu/Cell/SPUInterpreter.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" diff --git a/rpcs3/Emu/Cell/SPURecompiler.cpp b/rpcs3/Emu/Cell/SPURecompiler.cpp index d1086897ff..c490b187ea 100644 --- a/rpcs3/Emu/Cell/SPURecompiler.cpp +++ b/rpcs3/Emu/Cell/SPURecompiler.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/IdManager.h" #include "Emu/Memory/Memory.h" diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 7c9e280128..8377ded004 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/state.h" diff --git a/rpcs3/Emu/FS/VFS.cpp b/rpcs3/Emu/FS/VFS.cpp index ef58afac72..fdcfa4a37d 100644 --- a/rpcs3/Emu/FS/VFS.cpp +++ b/rpcs3/Emu/FS/VFS.cpp @@ -7,7 +7,6 @@ #include "vfsDeviceLocalFile.h" #include "Emu/System.h" #include "Emu/state.h" -#include "Utilities/Log.h" std::vector simplify_path_blocks(const std::string& path) { diff --git a/rpcs3/Emu/FS/vfsDirBase.cpp b/rpcs3/Emu/FS/vfsDirBase.cpp index 554fe8823f..8e4cccc327 100644 --- a/rpcs3/Emu/FS/vfsDirBase.cpp +++ b/rpcs3/Emu/FS/vfsDirBase.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/File.h" #include "vfsDirBase.h" vfsDirBase::vfsDirBase(vfsDevice* device) diff --git a/rpcs3/Emu/FS/vfsLocalDir.h b/rpcs3/Emu/FS/vfsLocalDir.h index 0eafef70d7..f64ae9a768 100644 --- a/rpcs3/Emu/FS/vfsLocalDir.h +++ b/rpcs3/Emu/FS/vfsLocalDir.h @@ -1,6 +1,5 @@ #pragma once #include "vfsDirBase.h" -#include "Utilities/File.h" class vfsLocalDir : public vfsDirBase { diff --git a/rpcs3/Emu/FS/vfsLocalFile.cpp b/rpcs3/Emu/FS/vfsLocalFile.cpp index eec2345755..efe713c8ba 100644 --- a/rpcs3/Emu/FS/vfsLocalFile.cpp +++ b/rpcs3/Emu/FS/vfsLocalFile.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "vfsLocalFile.h" vfsLocalFile::vfsLocalFile(vfsDevice* device) : vfsFileBase(device) diff --git a/rpcs3/Emu/FS/vfsStream.h b/rpcs3/Emu/FS/vfsStream.h index a73ae1c8b0..826e5acf77 100644 --- a/rpcs3/Emu/FS/vfsStream.h +++ b/rpcs3/Emu/FS/vfsStream.h @@ -1,7 +1,5 @@ #pragma once -#include "Utilities/File.h" - struct vfsStream { vfsStream() = default; diff --git a/rpcs3/Emu/HDD/HDD.cpp b/rpcs3/Emu/HDD/HDD.cpp index 9675fde84a..aa5d293cc3 100644 --- a/rpcs3/Emu/HDD/HDD.cpp +++ b/rpcs3/Emu/HDD/HDD.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "HDD.h" void vfsHDDManager::CreateBlock(vfsHDD_Block& block) diff --git a/rpcs3/Emu/Io/XInput/XInputPadHandler.cpp b/rpcs3/Emu/Io/XInput/XInputPadHandler.cpp index 5823f71367..779618f4e3 100644 --- a/rpcs3/Emu/Io/XInput/XInputPadHandler.cpp +++ b/rpcs3/Emu/Io/XInput/XInputPadHandler.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "stdafx_gui.h" #ifdef _MSC_VER -#include "Utilities/Log.h" #include "XInputPadHandler.h" namespace { diff --git a/rpcs3/Emu/Memory/Memory.cpp b/rpcs3/Emu/Memory/Memory.cpp index 44be3c6290..d9ca368f29 100644 --- a/rpcs3/Emu/Memory/Memory.cpp +++ b/rpcs3/Emu/Memory/Memory.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Memory.h" VirtualMemoryBlock RSXIOMem; diff --git a/rpcs3/Emu/Memory/MemoryBlock.h b/rpcs3/Emu/Memory/MemoryBlock.h index 113f4835d1..c07db09af4 100644 --- a/rpcs3/Emu/Memory/MemoryBlock.h +++ b/rpcs3/Emu/Memory/MemoryBlock.h @@ -1,7 +1,5 @@ #pragma once -#include "Utilities/Log.h" - struct MemInfo { u32 addr; diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/Emu/Memory/vm.cpp index 83add764ba..1d8d2b61c4 100644 --- a/rpcs3/Emu/Memory/vm.cpp +++ b/rpcs3/Emu/Memory/vm.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Memory.h" #include "Emu/System.h" #include "Utilities/Thread.h" diff --git a/rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp b/rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp index 1bfabf207c..9c9aee7dcd 100644 --- a/rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "Emu/System.h" -#include "Utilities/Log.h" #include "CgBinaryProgram.h" #include "Emu/RSX/RSXFragmentProgram.h" diff --git a/rpcs3/Emu/RSX/CgBinaryProgram.h b/rpcs3/Emu/RSX/CgBinaryProgram.h index 4029c5d273..c77c1659f1 100644 --- a/rpcs3/Emu/RSX/CgBinaryProgram.h +++ b/rpcs3/Emu/RSX/CgBinaryProgram.h @@ -1,7 +1,5 @@ #pragma once #include -#include "Utilities/File.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/RSX/GL/GLVertexProgram.h" #include "Emu/RSX/GL/GLFragmentProgram.h" diff --git a/rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp b/rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp index 44a11f338a..ca493c51df 100644 --- a/rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp +++ b/rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "Emu/System.h" -#include "Utilities/Log.h" #include "CgBinaryProgram.h" #include "Emu/RSX/RSXVertexProgram.h" diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.cpp b/rpcs3/Emu/RSX/Common/BufferUtils.cpp index b53f6f7ca9..80be2f3329 100644 --- a/rpcs3/Emu/RSX/Common/BufferUtils.cpp +++ b/rpcs3/Emu/RSX/Common/BufferUtils.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "BufferUtils.h" -#include "Utilities/Log.h" #define MIN2(x, y) ((x) < (y)) ? (x) : (y) #define MAX2(x, y) ((x) > (y)) ? (x) : (y) diff --git a/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.cpp b/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.cpp index 2f05e08db6..b000054c66 100644 --- a/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.cpp +++ b/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" diff --git a/rpcs3/Emu/RSX/Common/ProgramStateCache.h b/rpcs3/Emu/RSX/Common/ProgramStateCache.h index 2f7bc9263b..1fd0996fdf 100644 --- a/rpcs3/Emu/RSX/Common/ProgramStateCache.h +++ b/rpcs3/Emu/RSX/Common/ProgramStateCache.h @@ -2,7 +2,6 @@ #include "Emu/RSX/RSXFragmentProgram.h" #include "Emu/RSX/RSXVertexProgram.h" -#include "Utilities/Log.h" enum class SHADER_TYPE diff --git a/rpcs3/Emu/RSX/Common/TextureUtils.cpp b/rpcs3/Emu/RSX/Common/TextureUtils.cpp index 79ee348ee6..e15c9e174a 100644 --- a/rpcs3/Emu/RSX/Common/TextureUtils.cpp +++ b/rpcs3/Emu/RSX/Common/TextureUtils.cpp @@ -2,7 +2,6 @@ #include "Emu/Memory/vm.h" #include "TextureUtils.h" #include "../RSXThread.h" -#include "Utilities/Log.h" #define MAX2(a, b) ((a) > (b)) ? (a) : (b) diff --git a/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp b/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp index e15c2850b9..237d946cff 100644 --- a/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp +++ b/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/System.h" #include "VertexProgramDecompiler.h" diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp b/rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp index 7335a813dc..e74fad427b 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "stdafx_d3d12.h" #ifdef _MSC_VER -#include "Utilities/Log.h" #include "D3D12GSRender.h" #include "d3dx12.h" diff --git a/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp b/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp index ddd83875d5..986f6dad63 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp @@ -3,7 +3,6 @@ #ifdef _MSC_VER #include "D3D12FragmentProgramDecompiler.h" #include "D3D12CommonDecompiler.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" diff --git a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h index 64735f818c..5f2feadbb0 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h +++ b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h @@ -2,8 +2,6 @@ #include "D3D12Utils.h" #include "Utilities/rPlatform.h" // only for rImage -#include "Utilities/File.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/RSX/GSRender.h" diff --git a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h index b6c229382f..b0adcbf122 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h +++ b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h @@ -4,7 +4,6 @@ #include "../Common/ProgramStateCache.h" #include "D3D12VertexProgramDecompiler.h" #include "D3D12FragmentProgramDecompiler.h" -#include "Utilities/File.h" struct D3D12PipelineProperties { diff --git a/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp b/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp index be03d719b7..896f929314 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp @@ -3,8 +3,6 @@ #ifdef _MSC_VER #include "D3D12RenderTargetSets.h" #include "Utilities/rPlatform.h" // only for rImage -#include "Utilities/File.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/state.h" diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp b/rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp index 8bbbc4a90d..21f7ee9716 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp @@ -3,7 +3,6 @@ #ifdef _MSC_VER #include "D3D12GSRender.h" #include "d3dx12.h" -#include "Utilities/Log.h" #define STRINGIFY(x) #x extern PFN_D3D12_SERIALIZE_ROOT_SIGNATURE wrapD3D12SerializeRootSignature; diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Utils.h b/rpcs3/Emu/RSX/D3D12/D3D12Utils.h index 013e5c6dcf..82850e19ee 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12Utils.h +++ b/rpcs3/Emu/RSX/D3D12/D3D12Utils.h @@ -3,7 +3,6 @@ #include #include #include -#include "Utilities/Log.h" #include "Emu/Memory/vm.h" #include "Emu/RSX/GCM.h" diff --git a/rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.cpp b/rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.cpp index 238cd12b82..fe5a908594 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.cpp @@ -3,7 +3,6 @@ #ifdef _MSC_VER #include "D3D12VertexProgramDecompiler.h" #include "D3D12CommonDecompiler.h" -#include "Utilities/Log.h" #include "Emu/System.h" diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp index 4e7afca038..24600c02eb 100644 --- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "GLFragmentProgram.h" diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index 9b0c5d0146..7d5bdf9d35 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -1,7 +1,5 @@ #include "stdafx.h" #include "Utilities/rPlatform.h" // only for rImage -#include "Utilities/File.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/state.h" @@ -11,6 +9,7 @@ GLGSRender::GLGSRender() : GSRender(frame_type::OpenGL) { + shaders_cache.load(rsx::shader_language::glsl); } u32 GLGSRender::enable(u32 condition, u32 cap) diff --git a/rpcs3/Emu/RSX/GL/GLProgramBuffer.h b/rpcs3/Emu/RSX/GL/GLProgramBuffer.h index fad18c583d..0bb8313a9e 100644 --- a/rpcs3/Emu/RSX/GL/GLProgramBuffer.h +++ b/rpcs3/Emu/RSX/GL/GLProgramBuffer.h @@ -2,7 +2,6 @@ #include "GLVertexProgram.h" #include "GLFragmentProgram.h" #include "../Common/ProgramStateCache.h" -#include "Utilities/File.h" struct GLTraits { diff --git a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp b/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp index ab1611e681..415411db6d 100644 --- a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/System.h" #include "GLVertexProgram.h" diff --git a/rpcs3/Emu/RSX/GL/OpenGL.cpp b/rpcs3/Emu/RSX/GL/OpenGL.cpp index a4ef68af94..56a21dd6f8 100644 --- a/rpcs3/Emu/RSX/GL/OpenGL.cpp +++ b/rpcs3/Emu/RSX/GL/OpenGL.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "OpenGL.h" void gl::init() diff --git a/rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp b/rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp index 4326be3438..6653eace01 100644 --- a/rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp +++ b/rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "rsx_gl_texture.h" #include "gl_helpers.h" #include "../GCM.h" diff --git a/rpcs3/Emu/RSX/GSManager.cpp b/rpcs3/Emu/RSX/GSManager.cpp index 044ef34aa6..6bb058a596 100644 --- a/rpcs3/Emu/RSX/GSManager.cpp +++ b/rpcs3/Emu/RSX/GSManager.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/System.h" #include "Emu/Memory/Memory.h" #include "Emu/SysCalls/Modules/cellVideoOut.h" diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index 3373bc5187..5c218bdf1c 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/state.h" @@ -12,8 +11,6 @@ #include "Common/BufferUtils.h" -#include "Utilities/types.h" - extern "C" { #include "libswscale/swscale.h" @@ -808,6 +805,68 @@ namespace rsx } } __rsx_methods; + std::string shaders_cache::path_to_root() + { + return fs::get_executable_dir() + "data/"; + } + + void shaders_cache::load(const std::string &path, shader_language lang) + { + std::string lang_name = convert::to(lang); + + auto extract_hash = [](const std::string &string) + { + return std::stoull(string.substr(0, string.find('.')).c_str(), 0, 16); + }; + + for (const fs::dir::entry &entry : fs::dir{ path }) + { + if (entry.name == "." || entry.name == "..") + continue; + + u64 hash; + + try + { + hash = extract_hash(entry.name); + } + catch (...) + { + LOG_ERROR(RSX, "Cache file '%s' ignored", entry.name); + continue; + } + + if (fmt::match(entry.name, "*.fs." + lang_name)) + { + fs::file file{ path + entry.name }; + decompiled_fragment_shaders.insert(hash, { (const std::string)file }); + continue; + } + + if (fmt::match(entry.name, "*.vs." + lang_name)) + { + fs::file file{ path + entry.name }; + decompiled_vertex_shaders.insert(hash, { (const std::string)file }); + continue; + } + } + } + + void shaders_cache::load(shader_language lang) + { + std::string root = path_to_root(); + + //shared cache + load(root + "cache/", lang); + + std::string title_id = Emu.GetTitleID(); + + if (!title_id.empty()) + { + load(root + title_id + "/cache/", lang); + } + } + u32 get_address(u32 offset, u32 location) { u32 res = 0; diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h index 48cc31b117..e4fe59294d 100644 --- a/rpcs3/Emu/RSX/RSXThread.h +++ b/rpcs3/Emu/RSX/RSXThread.h @@ -9,6 +9,7 @@ #include "Utilities/Semaphore.h" #include "Utilities/Thread.h" #include "Utilities/Timer.h" +#include "Utilities/convert.h" extern u64 get_system_time(); @@ -41,6 +42,49 @@ struct frame_capture_data extern bool user_asked_for_frame_capture; extern frame_capture_data frame_debug; +namespace rsx +{ + enum class shader_language + { + glsl, + hlsl + }; +} + +namespace convert +{ + template<> + struct to_impl_t + { + static rsx::shader_language func(const std::string &from) + { + if (from == "glsl") + return rsx::shader_language::glsl; + + if (from == "hlsl") + return rsx::shader_language::hlsl; + + throw; + } + }; + + template<> + struct to_impl_t + { + static std::string func(rsx::shader_language from) + { + switch (from) + { + case rsx::shader_language::glsl: + return "glsl"; + case rsx::shader_language::hlsl: + return "hlsl"; + } + + throw; + } + }; +} namespace rsx { namespace limits @@ -57,6 +101,53 @@ namespace rsx }; } + struct decompiled_shader + { + std::string code; + }; + + struct finalized_shader + { + u64 ucode_hash; + std::string code; + }; + + template> + struct cache + { + private: + std::unordered_map m_entries; + + public: + const Type* find(u64 key) const + { + auto found = m_entries.find(key); + + if (found == m_entries.end()) + return nullptr; + + return &found->second; + } + + void insert(KeyType key, const Type &shader) + { + m_entries.insert({ key, shader }); + } + }; + + struct shaders_cache + { + cache decompiled_fragment_shaders; + cache decompiled_vertex_shaders; + cache finailized_fragment_shaders; + cache finailized_vertex_shaders; + + void load(const std::string &path, shader_language lang); + void load(shader_language lang); + + static std::string path_to_root(); + }; + //TODO union alignas(4) method_registers_t { @@ -260,6 +351,8 @@ namespace rsx std::stack m_call_stack; public: + struct shaders_cache shaders_cache; + CellGcmControl* ctrl = nullptr; Timer timer_sync; diff --git a/rpcs3/Emu/SysCalls/Callback.cpp b/rpcs3/Emu/SysCalls/Callback.cpp index 288be60290..d2146c161f 100644 --- a/rpcs3/Emu/SysCalls/Callback.cpp +++ b/rpcs3/Emu/SysCalls/Callback.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/IdManager.h" diff --git a/rpcs3/Emu/SysCalls/LogBase.cpp b/rpcs3/Emu/SysCalls/LogBase.cpp index a3383c1afa..23a2ccb44d 100644 --- a/rpcs3/Emu/SysCalls/LogBase.cpp +++ b/rpcs3/Emu/SysCalls/LogBase.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/System.h" #include "Emu/state.h" #include "LogBase.h" diff --git a/rpcs3/Emu/SysCalls/Modules.cpp b/rpcs3/Emu/SysCalls/Modules.cpp index acb238a050..d7643ee27c 100644 --- a/rpcs3/Emu/SysCalls/Modules.cpp +++ b/rpcs3/Emu/SysCalls/Modules.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/state.h" diff --git a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp index 6a212017ff..2207c2c9ec 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp @@ -3,7 +3,6 @@ #include "Emu/System.h" #include "Emu/state.h" #include "Emu/SysCalls/Modules.h" -#include "Utilities/Log.h" #include "cellSysutil.h" #include "cellNetCtl.h" diff --git a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp index 4627759b26..2da10e5992 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp @@ -6,7 +6,6 @@ #include "Emu/FS/VFS.h" #include "Emu/FS/vfsFile.h" #include "Emu/FS/vfsDir.h" -#include "Utilities/File.h" #include "Loader/PSF.h" #include "cellSaveData.h" diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp index 6fa6b7ab35..28248da4f0 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/state.h" diff --git a/rpcs3/Emu/SysCalls/Modules/libmixer.cpp b/rpcs3/Emu/SysCalls/Modules/libmixer.cpp index 34b811ef2b..3852ec87c2 100644 --- a/rpcs3/Emu/SysCalls/Modules/libmixer.cpp +++ b/rpcs3/Emu/SysCalls/Modules/libmixer.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/IdManager.h" diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp index c7c514e83f..15031e1275 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp @@ -6,7 +6,6 @@ #include "Emu/SysCalls/lv2/sys_process.h" #include "Emu/FS/VFS.h" -#include "Utilities/File.h" #include "Emu/FS/vfsDir.h" #include "Crypto/unedat.h" #include "sceNp.h" diff --git a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp index 3f74e95263..b038aee743 100644 --- a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/SysCalls/Modules.h" diff --git a/rpcs3/Emu/SysCalls/Modules/sys_libc.cpp b/rpcs3/Emu/SysCalls/Modules/sys_libc.cpp index 7911927c62..5c394b77f2 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_libc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_libc.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/SysCalls/Modules.h" diff --git a/rpcs3/Emu/SysCalls/SysCalls.cpp b/rpcs3/Emu/SysCalls/SysCalls.cpp index eda95867c7..62cb2fea3f 100644 --- a/rpcs3/Emu/SysCalls/SysCalls.cpp +++ b/rpcs3/Emu/SysCalls/SysCalls.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Utilities/AutoPause.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" diff --git a/rpcs3/Emu/SysCalls/lv2/sys_tty.cpp b/rpcs3/Emu/SysCalls/lv2/sys_tty.cpp index 1460056046..b674c5f87d 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_tty.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_tty.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/SysCalls/SysCalls.h" diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 7dc9d09601..b6b3859fd4 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -4,8 +4,6 @@ #include "events.h" #include "state.h" -#include "Utilities/Log.h" -#include "Utilities/File.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" diff --git a/rpcs3/Emu/events.h b/rpcs3/Emu/events.h index 0398698f52..e7c0167621 100644 --- a/rpcs3/Emu/events.h +++ b/rpcs3/Emu/events.h @@ -1,5 +1,6 @@ #pragma once -#include "Utilities/event.h" + +#include namespace rpcs3 { @@ -7,4 +8,4 @@ namespace rpcs3 extern event onstart; extern event onstop; extern event onpause; -} \ No newline at end of file +} diff --git a/rpcs3/Gui/AutoPauseManager.cpp b/rpcs3/Gui/AutoPauseManager.cpp index 091f272f12..0b3d5ac8ef 100644 --- a/rpcs3/Gui/AutoPauseManager.cpp +++ b/rpcs3/Gui/AutoPauseManager.cpp @@ -2,8 +2,6 @@ #include "stdafx_gui.h" #include "Emu/System.h" #include "AutoPauseManager.h" -#include "Utilities/Log.h" -#include "Utilities/File.h" //TODO::Get the enable configuration from ini. AutoPauseManagerDialog::AutoPauseManagerDialog(wxWindow* parent) diff --git a/rpcs3/Gui/ConLogFrame.cpp b/rpcs3/Gui/ConLogFrame.cpp index 96269d479d..5035af4c37 100644 --- a/rpcs3/Gui/ConLogFrame.cpp +++ b/rpcs3/Gui/ConLogFrame.cpp @@ -5,7 +5,6 @@ #include #include "Emu/state.h" -#include "Utilities/Log.h" #include "Gui/ConLogFrame.h" wxDEFINE_EVENT(EVT_LOG_COMMAND, wxCommandEvent); diff --git a/rpcs3/Gui/GameViewer.cpp b/rpcs3/Gui/GameViewer.cpp index d13837a056..43bbe23d3d 100644 --- a/rpcs3/Gui/GameViewer.cpp +++ b/rpcs3/Gui/GameViewer.cpp @@ -1,8 +1,6 @@ #include "stdafx.h" #include "stdafx_gui.h" #include "Utilities/AutoPause.h" -#include "Utilities/Log.h" -#include "Utilities/File.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/FS/VFS.h" diff --git a/rpcs3/Gui/GameViewer.h b/rpcs3/Gui/GameViewer.h index 5b62a851cf..e7cd287ed2 100644 --- a/rpcs3/Gui/GameViewer.h +++ b/rpcs3/Gui/GameViewer.h @@ -4,7 +4,6 @@ #include #include "Emu/GameInfo.h" #include "Emu/state.h" -#include "Utilities/Log.h" struct Column { diff --git a/rpcs3/Gui/InterpreterDisAsm.cpp b/rpcs3/Gui/InterpreterDisAsm.cpp index ed90b9e61a..098d77c0b2 100644 --- a/rpcs3/Gui/InterpreterDisAsm.cpp +++ b/rpcs3/Gui/InterpreterDisAsm.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "stdafx_gui.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "rpcs3.h" diff --git a/rpcs3/Gui/KernelExplorer.cpp b/rpcs3/Gui/KernelExplorer.cpp index ced4b62646..ef906b1d16 100644 --- a/rpcs3/Gui/KernelExplorer.cpp +++ b/rpcs3/Gui/KernelExplorer.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "stdafx_gui.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" diff --git a/rpcs3/Gui/LLEModulesManager.cpp b/rpcs3/Gui/LLEModulesManager.cpp index bdb8dbd6a2..9f47b9a202 100644 --- a/rpcs3/Gui/LLEModulesManager.cpp +++ b/rpcs3/Gui/LLEModulesManager.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "stdafx_gui.h" -#include "Utilities/Log.h" #include "Loader/ELF64.h" #include "Emu/FS/vfsDir.h" #include "Emu/FS/vfsFile.h" diff --git a/rpcs3/Gui/MemoryStringSearcher.cpp b/rpcs3/Gui/MemoryStringSearcher.cpp index 200be53d53..184cce2c99 100644 --- a/rpcs3/Gui/MemoryStringSearcher.cpp +++ b/rpcs3/Gui/MemoryStringSearcher.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "stdafx_gui.h" #include "Utilities/rPlatform.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" diff --git a/rpcs3/Gui/MemoryViewer.cpp b/rpcs3/Gui/MemoryViewer.cpp index 130847c54c..a09f8fdc76 100644 --- a/rpcs3/Gui/MemoryViewer.cpp +++ b/rpcs3/Gui/MemoryViewer.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "stdafx_gui.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "MemoryViewer.h" diff --git a/rpcs3/Gui/PADManager.cpp b/rpcs3/Gui/PADManager.cpp index e5c6f01b10..0ff406ba1b 100644 --- a/rpcs3/Gui/PADManager.cpp +++ b/rpcs3/Gui/PADManager.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "stdafx_gui.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/state.h" diff --git a/rpcs3/Gui/RSXDebugger.cpp b/rpcs3/Gui/RSXDebugger.cpp index 25a63c210e..5eefb3752d 100644 --- a/rpcs3/Gui/RSXDebugger.cpp +++ b/rpcs3/Gui/RSXDebugger.cpp @@ -4,8 +4,6 @@ #include "RSXDebugger.h" #include "Utilities/rPlatform.h" -#include "Utilities/Log.h" -#include "Utilities/File.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/state.h" diff --git a/rpcs3/Gui/SaveDataUtility.cpp b/rpcs3/Gui/SaveDataUtility.cpp index f25a49e8ef..ff5e7e30aa 100644 --- a/rpcs3/Gui/SaveDataUtility.cpp +++ b/rpcs3/Gui/SaveDataUtility.cpp @@ -1,8 +1,6 @@ #include "stdafx.h" #include "stdafx_gui.h" #include "SaveDataUtility.h" -#include "Utilities/Log.h" -//#include "Utilities/File.h" //Cause i can not decide what struct to be used to fill those. Just use no real data now. //Currently variable info isn't used. it supposed to be a container for the information passed by other. diff --git a/rpcs3/Gui/SettingsDialog.cpp b/rpcs3/Gui/SettingsDialog.cpp index 1465a90c41..4827f640d4 100644 --- a/rpcs3/Gui/SettingsDialog.cpp +++ b/rpcs3/Gui/SettingsDialog.cpp @@ -5,8 +5,6 @@ #include "Emu/state.h" #include "Emu/SysCalls/Modules/cellVideoOut.h" #include "SettingsDialog.h" -#include "Utilities/Log.h" -#include "Utilities/File.h" #include #ifdef _WIN32 diff --git a/rpcs3/Gui/VFSManager.cpp b/rpcs3/Gui/VFSManager.cpp index ead39cc391..ba6f95319d 100644 --- a/rpcs3/Gui/VFSManager.cpp +++ b/rpcs3/Gui/VFSManager.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "stdafx_gui.h" -#include "Utilities/Log.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/FS/VFS.h" diff --git a/rpcs3/Gui/VHDDManager.cpp b/rpcs3/Gui/VHDDManager.cpp index 223ebefee0..81ff563985 100644 --- a/rpcs3/Gui/VHDDManager.cpp +++ b/rpcs3/Gui/VHDDManager.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "stdafx_gui.h" -#include "Utilities/Log.h" #include "VHDDManager.h" #include "TextInputDialog.h" #include "Emu/state.h" diff --git a/rpcs3/Loader/ELF32.cpp b/rpcs3/Loader/ELF32.cpp index 68903e471b..46ec67b164 100644 --- a/rpcs3/Loader/ELF32.cpp +++ b/rpcs3/Loader/ELF32.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "ELF32.h" -#include "Utilities/Log.h" #include "Emu/FS/vfsStream.h" #include "Emu/Memory/Memory.h" #include "Emu/Cell/SPUThread.h" diff --git a/rpcs3/Loader/ELF64.cpp b/rpcs3/Loader/ELF64.cpp index 12e043a55e..23c684b697 100644 --- a/rpcs3/Loader/ELF64.cpp +++ b/rpcs3/Loader/ELF64.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/FS/vfsStream.h" #include "Emu/FS/vfsFile.h" #include "Emu/FS/vfsDir.h" diff --git a/rpcs3/Loader/Loader.cpp b/rpcs3/Loader/Loader.cpp index 0099f86e09..dcc0e2d5f7 100644 --- a/rpcs3/Loader/Loader.cpp +++ b/rpcs3/Loader/Loader.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Loader.h" #include "PSF.h" #include "Emu/FS/vfsLocalFile.h" diff --git a/rpcs3/Loader/PSF.cpp b/rpcs3/Loader/PSF.cpp index e6d78fdcae..93a7f87399 100644 --- a/rpcs3/Loader/PSF.cpp +++ b/rpcs3/Loader/PSF.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/FS/vfsStream.h" #include "PSF.h" diff --git a/rpcs3/Loader/TROPUSR.cpp b/rpcs3/Loader/TROPUSR.cpp index a7ec1714e3..3ae1e603cc 100644 --- a/rpcs3/Loader/TROPUSR.cpp +++ b/rpcs3/Loader/TROPUSR.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Utilities/rXml.h" #include "Emu/FS/VFS.h" #include "Emu/FS/vfsFileBase.h" diff --git a/rpcs3/Loader/TRP.cpp b/rpcs3/Loader/TRP.cpp index db0b9604f6..fed01da031 100644 --- a/rpcs3/Loader/TRP.cpp +++ b/rpcs3/Loader/TRP.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include "Utilities/Log.h" #include "Emu/System.h" #include "Emu/FS/VFS.h" #include "Emu/FS/vfsFile.h" diff --git a/rpcs3/config.cpp b/rpcs3/config.cpp index 14424d228b..cc9f43c686 100644 --- a/rpcs3/config.cpp +++ b/rpcs3/config.cpp @@ -1,8 +1,6 @@ #include "stdafx.h" #include "config.h" -#include "Utilities/File.h" - namespace rpcs3 { config_t::config_t(const std::string &path_) diff --git a/rpcs3/rpcs3.cpp b/rpcs3/rpcs3.cpp index 485eec695e..0ff4e3c848 100644 --- a/rpcs3/rpcs3.cpp +++ b/rpcs3/rpcs3.cpp @@ -4,7 +4,6 @@ #include "Emu/System.h" #include "Emu/state.h" #include "rpcs3.h" -#include "Utilities/Log.h" #include "Gui/ConLogFrame.h" #include "Emu/GameInfo.h" diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index 5f37371898..ecf3a3c1a5 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -186,3 +186,5 @@ template struct id_traits; #include "Utilities/Atomic.h" #include "Utilities/StrFmt.h" #include "Utilities/BitField.h" +#include "Utilities/File.h" +#include "Utilities/Log.h" diff --git a/rsx_program_decompiler b/rsx_program_decompiler new file mode 160000 index 0000000000..139d8092b9 --- /dev/null +++ b/rsx_program_decompiler @@ -0,0 +1 @@ +Subproject commit 139d8092b9daaa823f6398d4a273fdc0a1d20c09