diff --git a/CMakeLists.txt b/CMakeLists.txt index 90238721060c..76aed46de5f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1612,7 +1612,6 @@ set(GPU_SOURCES GPU/Common/TextureScalerCommon.h GPU/Common/PostShader.cpp GPU/Common/PostShader.h - GPU/Common/SplineCommon.h GPU/Debugger/Breakpoints.cpp GPU/Debugger/Breakpoints.h GPU/Debugger/Debugger.cpp @@ -1661,7 +1660,6 @@ set(GPU_SOURCES GPU/Software/SoftGpu.h GPU/Software/TransformUnit.cpp GPU/Software/TransformUnit.h - GPU/ge_constants.h ) # 'ppsspp_jni' on ANDROID, 'Core' everywhere else diff --git a/Common/File/PathBrowser.cpp b/Common/File/PathBrowser.cpp index c3f0c266757f..a86f9f246f9e 100644 --- a/Common/File/PathBrowser.cpp +++ b/Common/File/PathBrowser.cpp @@ -15,15 +15,12 @@ #include "Common/Log.h" #include "Common/Thread/ThreadUtil.h" -#include "Core/Config.h" -#include "Core/System.h" - #if PPSSPP_PLATFORM(ANDROID) #include "android/jni/app-android.h" #include "android/jni/AndroidContentURI.h" #endif -bool LoadRemoteFileList(const Path &url, bool *cancel, std::vector &files) { +bool LoadRemoteFileList(const Path &url, const std::string &userAgent, bool *cancel, std::vector &files) { _dbg_assert_(url.Type() == PathType::HTTP); http::Client http; @@ -31,7 +28,7 @@ bool LoadRemoteFileList(const Path &url, bool *cancel, std::vector responseHeaders; - http.SetUserAgent(StringFromFormat("PPSSPP/%s", PPSSPP_GIT_VERSION)); + http.SetUserAgent(userAgent); Url baseURL(url.ToString()); if (!baseURL.Valid()) { @@ -159,7 +156,7 @@ void PathBrowser::HandlePath() { if (lastPath.Type() == PathType::HTTP) { guard.unlock(); results.clear(); - success = LoadRemoteFileList(lastPath, &pendingCancel_, results); + success = LoadRemoteFileList(lastPath, userAgent_, &pendingCancel_, results); guard.lock(); } else if (lastPath.empty()) { results.clear(); @@ -196,10 +193,8 @@ bool PathBrowser::IsListingReady() { std::string PathBrowser::GetFriendlyPath() const { std::string str = GetPath().ToVisualString(); // Show relative to memstick root if there. - std::string root = GetSysDirectory(DIRECTORY_MEMSTICK_ROOT).ToVisualString(); - - if (startsWith(str, root)) { - return std::string("ms:") + str.substr(root.size()); + if (startsWith(str, aliasMatch_)) { + return aliasDisplay_ + str.substr(aliasMatch_.size()); } #if PPSSPP_PLATFORM(LINUX) || PPSSPP_PLATFORM(MAC) diff --git a/Common/File/PathBrowser.h b/Common/File/PathBrowser.h index 9f10cde56053..aa7c7c068fa9 100644 --- a/Common/File/PathBrowser.h +++ b/Common/File/PathBrowser.h @@ -35,6 +35,14 @@ class PathBrowser { } std::string GetFriendlyPath() const; + void SetUserAgent(const std::string &s) { + userAgent_ = s; + } + void SetRootAlias(const std::string &alias, const std::string &longValue) { + aliasDisplay_ = alias; + aliasMatch_ = longValue; + } + bool empty() const { return path_.empty(); } @@ -45,6 +53,9 @@ class PathBrowser { Path path_; Path pendingPath_; + std::string userAgent_; + std::string aliasDisplay_; + std::string aliasMatch_; std::vector pendingFiles_; std::condition_variable pendingCond_; std::mutex pendingLock_; diff --git a/Common/GPU/OpenGL/GLQueueRunner.cpp b/Common/GPU/OpenGL/GLQueueRunner.cpp index bf27a4fcfaa8..0191f57b50aa 100644 --- a/Common/GPU/OpenGL/GLQueueRunner.cpp +++ b/Common/GPU/OpenGL/GLQueueRunner.cpp @@ -9,11 +9,11 @@ #include "Common/VR/PPSSPPVR.h" #include "Common/Log.h" +#include "Common/LogReporting.h" #include "Common/MemoryUtil.h" #include "Common/StringUtils.h" #include "Common/Data/Convert/SmallDataConvert.h" -#include "Core/Reporting.h" #include "GLQueueRunner.h" #include "GLRenderManager.h" #include "DataFormatGL.h" diff --git a/Common/GPU/Shader.cpp b/Common/GPU/Shader.cpp index 1fce76ff661f..147db1a1c0ca 100644 --- a/Common/GPU/Shader.cpp +++ b/Common/GPU/Shader.cpp @@ -118,7 +118,7 @@ void ShaderLanguageDesc::Init(ShaderLanguage lang) { } } -void init_resources(TBuiltInResource &Resources) { +void InitShaderResources(TBuiltInResource &Resources) { Resources.maxLights = 32; Resources.maxClipPlanes = 6; Resources.maxTextureUnits = 32; diff --git a/Common/GPU/Shader.h b/Common/GPU/Shader.h index 6e294457347d..43f6f4d38c9c 100644 --- a/Common/GPU/Shader.h +++ b/Common/GPU/Shader.h @@ -6,6 +6,9 @@ #include "Common/Common.h" +struct TBuiltInResource; +void InitShaderResources(TBuiltInResource &Resources); + // GLSL_1xx and GLSL_3xx each cover a lot of sub variants. All the little quirks // that differ are covered in ShaderLanguageDesc. // Defined as a bitmask so stuff like GetSupportedShaderLanguages can return combinations. diff --git a/Common/GPU/ShaderTranslation.cpp b/Common/GPU/ShaderTranslation.cpp index 9391d1b7da5f..dc9492b31b2f 100644 --- a/Common/GPU/ShaderTranslation.cpp +++ b/Common/GPU/ShaderTranslation.cpp @@ -41,6 +41,7 @@ #include "Common/GPU/ShaderTranslation.h" #include "ext/glslang/SPIRV/GlslangToSpv.h" #include "Common/GPU/thin3d.h" +#include "Common/GPU/Shader.h" #include "Common/GPU/OpenGL/GLFeatures.h" #include "ext/SPIRV-Cross/spirv.hpp" @@ -51,8 +52,6 @@ #include "ext/SPIRV-Cross/spirv_hlsl.hpp" #endif -extern void init_resources(TBuiltInResource &Resources); - static EShLanguage GetShLanguageFromStage(const ShaderStage stage) { switch (stage) { case ShaderStage::Vertex: return EShLangVertex; @@ -241,7 +240,7 @@ bool TranslateShader(std::string *dest, ShaderLanguage destLang, const ShaderLan const char *shaderStrings[1]{}; TBuiltInResource Resources{}; - init_resources(Resources); + InitShaderResources(Resources); // Don't enable SPIR-V and Vulkan rules when parsing GLSL. Our postshaders are written in oldschool GLES 2.0. EShMessages messages = EShMessages::EShMsgDefault; diff --git a/Common/GPU/ShaderWriter.h b/Common/GPU/ShaderWriter.h index 379e70431962..b10c3169b001 100644 --- a/Common/GPU/ShaderWriter.h +++ b/Common/GPU/ShaderWriter.h @@ -3,8 +3,6 @@ #include #include "Common/GPU/Shader.h" -#include "GPU/ge_constants.h" -#include "GPU/GPUCommon.h" #include "Common/Data/Collections/Slice.h" #include "Common/GPU/thin3d.h" diff --git a/Common/GPU/Vulkan/VulkanContext.cpp b/Common/GPU/Vulkan/VulkanContext.cpp index 72bdd3dca9d5..bc7120abc227 100644 --- a/Common/GPU/Vulkan/VulkanContext.cpp +++ b/Common/GPU/Vulkan/VulkanContext.cpp @@ -8,11 +8,10 @@ #include "Common/System/System.h" #include "Common/System/Display.h" #include "Common/Log.h" +#include "Common/GPU/Shader.h" #include "Common/GPU/Vulkan/VulkanContext.h" #include "Common/GPU/Vulkan/VulkanDebug.h" -#include "GPU/Common/ShaderCommon.h" #include "Common/StringUtils.h" -#include "Core/Config.h" #ifdef USE_CRT_DBG #undef new @@ -1317,7 +1316,7 @@ bool GLSLtoSPV(const VkShaderStageFlagBits shader_type, const char *sourceCode, glslang::TProgram program; const char *shaderStrings[1]; TBuiltInResource Resources{}; - init_resources(Resources); + InitShaderResources(Resources); int defaultVersion = 0; EShMessages messages; diff --git a/Common/GPU/Vulkan/thin3d_vulkan.cpp b/Common/GPU/Vulkan/thin3d_vulkan.cpp index 9448b80ce8be..affef2e2f5c7 100644 --- a/Common/GPU/Vulkan/thin3d_vulkan.cpp +++ b/Common/GPU/Vulkan/thin3d_vulkan.cpp @@ -33,8 +33,6 @@ #include "Common/GPU/Vulkan/VulkanMemory.h" #include "Common/Thread/Promise.h" -#include "Core/Config.h" - #include "Common/GPU/Vulkan/VulkanLoader.h" // We support a frame-global descriptor set, which can be optionally used by other code, @@ -385,6 +383,7 @@ class VKContext : public DrawContext { ~VKContext(); void DebugAnnotate(const char *annotation) override; + void SetDebugFlags(DebugFlags flags) override; const DeviceCaps &GetDeviceCaps() const override { return caps_; @@ -529,6 +528,7 @@ class VKContext : public DrawContext { AutoRef curFramebuffer_; VkDevice device_; + DebugFlags debugFlags_ = DebugFlags::NONE; enum { MAX_FRAME_COMMAND_BUFFERS = 256, @@ -1018,7 +1018,7 @@ VKContext::~VKContext() { void VKContext::BeginFrame() { // TODO: Bad dependency on g_Config here! - renderManager_.BeginFrame(g_Config.bShowGpuProfile, g_Config.bGpuLogProfiler); + renderManager_.BeginFrame(debugFlags_ & DebugFlags::PROFILE_TIMESTAMPS, debugFlags_ & DebugFlags::PROFILE_SCOPES); FrameData &frame = frame_[vulkan_->GetCurFrame()]; push_ = frame.pushBuffer; @@ -1763,4 +1763,8 @@ void VKContext::DebugAnnotate(const char *annotation) { renderManager_.DebugAnnotate(annotation); } +void VKContext::SetDebugFlags(DebugFlags flags) { + debugFlags_ = flags; +} + } // namespace Draw diff --git a/Common/GPU/thin3d.h b/Common/GPU/thin3d.h index 038e0b4a5197..2cd58fe4eed4 100644 --- a/Common/GPU/thin3d.h +++ b/Common/GPU/thin3d.h @@ -631,6 +631,13 @@ enum class TextureBindFlags { }; ENUM_CLASS_BITOPS(TextureBindFlags); +enum class DebugFlags { + NONE = 0, + PROFILE_TIMESTAMPS = 1, + PROFILE_SCOPES = 2, +}; +ENUM_CLASS_BITOPS(DebugFlags); + class DrawContext { public: virtual ~DrawContext(); @@ -655,6 +662,7 @@ class DrawContext { virtual void SetErrorCallback(ErrorCallbackFn callback, void *userdata) {} virtual void DebugAnnotate(const char *annotation) {} + virtual void SetDebugFlags(DebugFlags flags) {} // Partial pipeline state, used to create pipelines. (in practice, in d3d11 they'll use the native state objects directly). // TODO: Possibly ditch these and just put the descs directly in PipelineDesc since only D3D11 benefits. diff --git a/Common/Net/HTTPClient.h b/Common/Net/HTTPClient.h index e96102ce0572..cafe4b08c5bc 100644 --- a/Common/Net/HTTPClient.h +++ b/Common/Net/HTTPClient.h @@ -87,7 +87,7 @@ class Client : public net::Connection { dataTimeout_ = t; } - void SetUserAgent(const std::string &&value) { + void SetUserAgent(const std::string &value) { userAgent_ = value; } diff --git a/Common/UI/Context.cpp b/Common/UI/Context.cpp index 40bc95c82460..4a1400f30e5e 100644 --- a/Common/UI/Context.cpp +++ b/Common/UI/Context.cpp @@ -2,7 +2,6 @@ #include -#include "Core/Config.h" #include "Common/System/Display.h" #include "Common/System/System.h" #include "Common/UI/UI.h" @@ -62,11 +61,14 @@ void UIContext::BeginFrame() { } uidrawbufferTop_->SetCurZ(0.0f); uidrawbuffer_->SetCurZ(0.0f); - uidrawbuffer_->SetTintSaturation(g_Config.fUITint, g_Config.fUISaturation); - uidrawbufferTop_->SetTintSaturation(g_Config.fUITint, g_Config.fUISaturation); ActivateTopScissor(); } +void UIContext::SetTintSaturation(float tint, float sat) { + uidrawbuffer_->SetTintSaturation(tint, sat); + uidrawbufferTop_->SetTintSaturation(tint, sat); +} + void UIContext::Begin() { BeginPipeline(ui_pipeline_, sampler_); } diff --git a/Common/UI/Context.h b/Common/UI/Context.h index b7c6982176f0..1e2767d1819b 100644 --- a/Common/UI/Context.h +++ b/Common/UI/Context.h @@ -75,6 +75,8 @@ class UIContext { // Utility methods TextDrawer *Text() const { return textDrawer_; } + void SetTintSaturation(float tint, float sat); + void SetFontStyle(const UI::FontStyle &style); const UI::FontStyle &GetFontStyle() { return *fontStyle_; } void SetFontScale(float scaleX, float scaleY); diff --git a/Core/CoreTiming.cpp b/Core/CoreTiming.cpp index da24649553ca..4b2503232594 100644 --- a/Core/CoreTiming.cpp +++ b/Core/CoreTiming.cpp @@ -32,7 +32,6 @@ #include "Core/Config.h" #include "Core/HLE/sceKernelThread.h" #include "Core/MIPS/MIPS.h" -#include "Core/Reporting.h" static const int initialHz = 222000000; int CPU_HZ = 222000000; @@ -606,7 +605,6 @@ void Advance() { if (!first) { // This should never happen in PPSSPP. - // WARN_LOG_REPORT(TIME, "WARNING - no events in queue. Setting currentMIPS->downcount to 10000"); if (slicelength < 10000) { slicelength += 10000; currentMIPS->downcount += 10000; diff --git a/Core/CwCheat.h b/Core/CwCheat.h index 28ed82791a14..a012054eaed1 100644 --- a/Core/CwCheat.h +++ b/Core/CwCheat.h @@ -1,5 +1,4 @@ // Rough and ready CwCheats implementation, disabled by default. -// Will not enable by default until the TOOD:s have been addressed. #pragma once diff --git a/Core/HLE/ReplaceTables.cpp b/Core/HLE/ReplaceTables.cpp index 65461ff9028a..f9ddbf7de7b8 100644 --- a/Core/HLE/ReplaceTables.cpp +++ b/Core/HLE/ReplaceTables.cpp @@ -1018,7 +1018,7 @@ static int Hook_kumonohatateni_download_frame() { if (Memory::IsVRAMAddress(fb_address)) { gpu->PerformReadbackToMemory(fb_address, 0x00088000); NotifyMemInfo(MemBlockFlags::WRITE, fb_address, 0x00088000, "kumonohatateni_download_frame"); -} + } return 0; } @@ -1027,7 +1027,7 @@ static int Hook_otomenoheihou_download_frame() { if (Memory::IsVRAMAddress(fb_address)) { gpu->PerformReadbackToMemory(fb_address, 0x00088000); NotifyMemInfo(MemBlockFlags::WRITE, fb_address, 0x00088000, "otomenoheihou_download_frame"); -} + } return 0; } @@ -1054,7 +1054,7 @@ static int Hook_toheart2_download_frame() { if (Memory::IsVRAMAddress(fb_address)) { gpu->PerformReadbackToMemory(fb_address, 0x00044000); NotifyMemInfo(MemBlockFlags::WRITE, fb_address, 0x00044000, "toheart2_download_frame"); -} + } return 0; } diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index d2cf9ec31115..06fbdbf5d324 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -2173,7 +2173,7 @@ static u32 sceIoSetAsyncCallback(int id, u32 clbckId, u32 clbckArg) static u32 sceIoOpenAsync(const char *filename, int flags, int mode) { hleEatCycles(18000); - // TOOD: Use an internal method so as not to pollute the log? + // TODO: Use an internal method so as not to pollute the log? // Intentionally does not work when interrupts disabled. if (!__KernelIsDispatchEnabled()) sceKernelResumeDispatchThread(1); diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp index a7f5b7cb82dc..f0e0456995de 100644 --- a/Core/HLE/sceKernel.cpp +++ b/Core/HLE/sceKernel.cpp @@ -59,7 +59,6 @@ #include "sceKernelMutex.h" #include "sceKernelMbx.h" #include "sceKernelMsgPipe.h" -#include "sceKernelInterrupt.h" #include "sceKernelSemaphore.h" #include "sceKernelEventFlag.h" #include "sceKernelVTimer.h" diff --git a/Core/HLE/sceKernelMemory.cpp b/Core/HLE/sceKernelMemory.cpp index 55b7ff7044e4..23ff06c147e0 100644 --- a/Core/HLE/sceKernelMemory.cpp +++ b/Core/HLE/sceKernelMemory.cpp @@ -610,7 +610,7 @@ void __KernelFplEndCallback(SceUID threadID, SceUID prevCallbackId) { auto result = HLEKernel::WaitEndCallback(threadID, prevCallbackId, fplWaitTimer, __KernelUnlockFplForThread); if (result == HLEKernel::WAIT_CB_RESUMED_WAIT) - DEBUG_LOG(SCEKERNEL, "sceKernelReceiveMbxCB: Resuming mbx wait from callback"); + DEBUG_LOG(SCEKERNEL, "sceKernelAllocateFplCB: Resuming mbx wait from callback"); } static bool __FplThreadSortPriority(FplWaitingThread thread1, FplWaitingThread thread2) @@ -1452,7 +1452,7 @@ void __KernelVplEndCallback(SceUID threadID, SceUID prevCallbackId) { auto result = HLEKernel::WaitEndCallback(threadID, prevCallbackId, vplWaitTimer, __KernelUnlockVplForThread); if (result == HLEKernel::WAIT_CB_RESUMED_WAIT) - DEBUG_LOG(SCEKERNEL, "sceKernelReceiveMbxCB: Resuming mbx wait from callback"); + DEBUG_LOG(SCEKERNEL, "sceKernelAllocateVplCB: Resuming mbx wait from callback"); } static bool __VplThreadSortPriority(VplWaitingThread thread1, VplWaitingThread thread2) diff --git a/Core/MemMap.cpp b/Core/MemMap.cpp index 50a2d564fae4..fab39b4bc730 100644 --- a/Core/MemMap.cpp +++ b/Core/MemMap.cpp @@ -44,7 +44,6 @@ #include "Core/MIPS/JitCommon/JitBlockCache.h" #include "Core/MIPS/JitCommon/JitCommon.h" #include "Common/Thread/ParallelLoop.h" -#include "UI/OnScreenDisplay.h" namespace Memory { diff --git a/Core/MemMapFunctions.cpp b/Core/MemMapFunctions.cpp index da4fbcf3827f..fc379a411f5d 100644 --- a/Core/MemMapFunctions.cpp +++ b/Core/MemMapFunctions.cpp @@ -16,13 +16,13 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "Common/CommonTypes.h" +#include "Common/LogReporting.h" #include "Core/Core.h" #include "Core/MemMap.h" #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/Host.h" -#include "Core/Reporting.h" #include "Core/MIPS/MIPS.h" diff --git a/GPU/Common/DepalettizeShaderCommon.cpp b/GPU/Common/DepalettizeShaderCommon.cpp index 52c67152eff4..9b63679fa40d 100644 --- a/GPU/Common/DepalettizeShaderCommon.cpp +++ b/GPU/Common/DepalettizeShaderCommon.cpp @@ -23,7 +23,7 @@ #include "GPU/Common/ShaderCommon.h" #include "Common/StringUtils.h" #include "Common/Log.h" -#include "Core/Reporting.h" +#include "Common/LogReporting.h" #include "GPU/Common/GPUStateUtils.h" #include "GPU/Common/DepalettizeShaderCommon.h" #include "GPU/Common/Draw2D.h" diff --git a/GPU/Common/Draw2D.cpp b/GPU/Common/Draw2D.cpp index ddc752ae212b..6a37cb2c0dbe 100644 --- a/GPU/Common/Draw2D.cpp +++ b/GPU/Common/Draw2D.cpp @@ -20,7 +20,6 @@ #include "Common/GPU/thin3d.h" #include "Core/Config.h" #include "Core/ConfigValues.h" -#include "Core/Reporting.h" #include "GPU/Common/Draw2D.h" #include "GPU/Common/DrawEngineCommon.h" #include "GPU/Common/FramebufferManagerCommon.h" diff --git a/GPU/Common/FragmentShaderGenerator.cpp b/GPU/Common/FragmentShaderGenerator.cpp index f4274e025e56..6013d62766fe 100644 --- a/GPU/Common/FragmentShaderGenerator.cpp +++ b/GPU/Common/FragmentShaderGenerator.cpp @@ -24,7 +24,6 @@ #include "Common/GPU/ShaderWriter.h" #include "Common/GPU/thin3d.h" #include "Core/Compatibility.h" -#include "Core/Reporting.h" #include "Core/Config.h" #include "Core/System.h" #include "GPU/Common/GPUStateUtils.h" diff --git a/GPU/Common/FramebufferManagerCommon.cpp b/GPU/Common/FramebufferManagerCommon.cpp index 9a372da4269d..a354f366d09b 100644 --- a/GPU/Common/FramebufferManagerCommon.cpp +++ b/GPU/Common/FramebufferManagerCommon.cpp @@ -24,6 +24,7 @@ #include "Common/Data/Collections/TinySet.h" #include "Common/Data/Convert/ColorConv.h" #include "Common/Data/Text/I18n.h" +#include "Common/LogReporting.h" #include "Common/Math/lin/matrix4x4.h" #include "Common/Math/math_util.h" #include "Common/System/Display.h" @@ -37,7 +38,6 @@ #include "Core/Debugger/MemBlockInfo.h" #include "Core/Host.h" #include "Core/MIPS/MIPS.h" -#include "Core/Reporting.h" #include "GPU/Common/DrawEngineCommon.h" #include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/PostShader.h" diff --git a/GPU/Common/ShaderCommon.h b/GPU/Common/ShaderCommon.h index 63e31160145d..6a955513cfe0 100644 --- a/GPU/Common/ShaderCommon.h +++ b/GPU/Common/ShaderCommon.h @@ -162,6 +162,3 @@ enum { ATTR_COUNT, }; - -struct TBuiltInResource; -void init_resources(TBuiltInResource &Resources); diff --git a/GPU/Common/StencilCommon.cpp b/GPU/Common/StencilCommon.cpp index 31c10ecaba9b..9bf141756c2e 100644 --- a/GPU/Common/StencilCommon.cpp +++ b/GPU/Common/StencilCommon.cpp @@ -19,7 +19,6 @@ #include "Common/GPU/ShaderWriter.h" #include "Core/Config.h" #include "Core/ConfigValues.h" -#include "Core/Reporting.h" #include "GPU/Common/StencilCommon.h" #include "GPU/Common/DrawEngineCommon.h" #include "GPU/Common/FramebufferManagerCommon.h" diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp index faeef46975f3..0a4576355e0a 100644 --- a/GPU/Common/TextureCacheCommon.cpp +++ b/GPU/Common/TextureCacheCommon.cpp @@ -23,13 +23,13 @@ #include "Common/Data/Convert/ColorConv.h" #include "Common/Data/Collections/TinySet.h" #include "Common/Profiler/Profiler.h" +#include "Common/LogReporting.h" #include "Common/MemoryUtil.h" #include "Common/StringUtils.h" #include "Common/TimeUtil.h" #include "Common/Math/math_util.h" #include "Core/Config.h" #include "Core/Debugger/MemBlockInfo.h" -#include "Core/Reporting.h" #include "Core/System.h" #include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/TextureCacheCommon.h" diff --git a/GPU/Common/TextureShaderCommon.cpp b/GPU/Common/TextureShaderCommon.cpp index 93428a223860..e7faf67ac719 100644 --- a/GPU/Common/TextureShaderCommon.cpp +++ b/GPU/Common/TextureShaderCommon.cpp @@ -22,7 +22,6 @@ #include "Common/GPU/Shader.h" #include "Common/GPU/ShaderWriter.h" #include "Common/Data/Convert/ColorConv.h" -#include "Core/Reporting.h" #include "GPU/Common/Draw2D.h" #include "GPU/Common/DrawEngineCommon.h" #include "GPU/Common/TextureCacheCommon.h" diff --git a/GPU/Common/TransformCommon.h b/GPU/Common/TransformCommon.h index f33a33c4c325..4da0a83113c8 100644 --- a/GPU/Common/TransformCommon.h +++ b/GPU/Common/TransformCommon.h @@ -20,7 +20,6 @@ #include #include "Common/CommonTypes.h" -#include "Core/Reporting.h" #include "GPU/ge_constants.h" #include "GPU/Math3D.h" diff --git a/GPU/Common/VertexDecoderArm.cpp b/GPU/Common/VertexDecoderArm.cpp index e5eea51a3e9a..ed57fd89ccbf 100644 --- a/GPU/Common/VertexDecoderArm.cpp +++ b/GPU/Common/VertexDecoderArm.cpp @@ -28,7 +28,6 @@ #include "Common/CPUDetect.h" #include "Core/Config.h" -#include "Core/Reporting.h" #include "GPU/GPUState.h" #include "GPU/Common/VertexDecoderCommon.h" diff --git a/GPU/Common/VertexDecoderArm64.cpp b/GPU/Common/VertexDecoderArm64.cpp index 4e4385a22431..9743b3dc5231 100644 --- a/GPU/Common/VertexDecoderArm64.cpp +++ b/GPU/Common/VertexDecoderArm64.cpp @@ -21,7 +21,6 @@ #include "Common/CPUDetect.h" #include "Common/Log.h" #include "Core/Config.h" -#include "Core/Reporting.h" #include "Common/Arm64Emitter.h" #include "Core/MIPS/JitCommon/JitCommon.h" #include "GPU/GPUState.h" diff --git a/GPU/Common/VertexDecoderCommon.cpp b/GPU/Common/VertexDecoderCommon.cpp index ca38580d6575..e119f54a99cd 100644 --- a/GPU/Common/VertexDecoderCommon.cpp +++ b/GPU/Common/VertexDecoderCommon.cpp @@ -24,11 +24,11 @@ #include "Common/CPUDetect.h" #include "Common/Data/Convert/ColorConv.h" #include "Common/Log.h" +#include "Common/LogReporting.h" #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/MemMap.h" #include "Core/HDRemaster.h" -#include "Core/Reporting.h" #include "Core/MIPS/JitCommon/JitCommon.h" #include "Core/Util/AudioFormat.h" // for clamp_u8 #include "GPU/Common/ShaderCommon.h" diff --git a/GPU/Common/VertexDecoderCommon.h b/GPU/Common/VertexDecoderCommon.h index a326c0e75ea9..8cffdaf8d5ae 100644 --- a/GPU/Common/VertexDecoderCommon.h +++ b/GPU/Common/VertexDecoderCommon.h @@ -25,7 +25,7 @@ #include "Common/Data/Collections/Hashmaps.h" #include "Common/Data/Convert/SmallDataConvert.h" #include "Common/Log.h" -#include "Core/Reporting.h" +#include "Common/LogReporting.h" #include "GPU/ge_constants.h" #include "GPU/Common/ShaderCommon.h" #include "GPU/GPUCommon.h" diff --git a/GPU/Common/VertexDecoderX86.cpp b/GPU/Common/VertexDecoderX86.cpp index 728fafc313dd..3340961f8ea6 100644 --- a/GPU/Common/VertexDecoderX86.cpp +++ b/GPU/Common/VertexDecoderX86.cpp @@ -22,7 +22,6 @@ #include "Common/CPUDetect.h" #include "Core/Config.h" -#include "Core/Reporting.h" #include "GPU/GPUState.h" #include "GPU/Common/VertexDecoderCommon.h" diff --git a/GPU/D3D11/DrawEngineD3D11.cpp b/GPU/D3D11/DrawEngineD3D11.cpp index 196c8b8399bd..078c175169cc 100644 --- a/GPU/D3D11/DrawEngineD3D11.cpp +++ b/GPU/D3D11/DrawEngineD3D11.cpp @@ -24,7 +24,6 @@ #include "Core/MemMap.h" #include "Core/System.h" -#include "Core/Reporting.h" #include "Core/Config.h" #include "Core/CoreTiming.h" diff --git a/GPU/D3D11/GPU_D3D11.cpp b/GPU/D3D11/GPU_D3D11.cpp index 124171978fa7..ae7a7ef8fabd 100644 --- a/GPU/D3D11/GPU_D3D11.cpp +++ b/GPU/D3D11/GPU_D3D11.cpp @@ -27,7 +27,6 @@ #include "Core/MemMapHelpers.h" #include "Core/MIPS/MIPS.h" #include "Core/Config.h" -#include "Core/Reporting.h" #include "Core/System.h" #include "GPU/GPUState.h" @@ -42,10 +41,6 @@ #include "GPU/D3D11/TextureCacheD3D11.h" #include "GPU/D3D11/D3D11Util.h" -#include "Core/HLE/sceKernelThread.h" -#include "Core/HLE/sceKernelInterrupt.h" -#include "Core/HLE/sceGe.h" - GPU_D3D11::GPU_D3D11(GraphicsContext *gfxCtx, Draw::DrawContext *draw) : GPUCommon(gfxCtx, draw), drawEngine_(draw, (ID3D11Device *)draw->GetNativeObject(Draw::NativeObject::DEVICE), diff --git a/GPU/D3D11/ShaderManagerD3D11.cpp b/GPU/D3D11/ShaderManagerD3D11.cpp index 72668fc71856..11571978f069 100644 --- a/GPU/D3D11/ShaderManagerD3D11.cpp +++ b/GPU/D3D11/ShaderManagerD3D11.cpp @@ -30,7 +30,6 @@ #include "Common/Log.h" #include "Common/CommonTypes.h" #include "Core/Config.h" -#include "Core/Reporting.h" #include "GPU/Math3D.h" #include "GPU/GPUState.h" #include "GPU/ge_constants.h" diff --git a/GPU/D3D11/StateMappingD3D11.cpp b/GPU/D3D11/StateMappingD3D11.cpp index 2174da2ce90f..ac80c9627a11 100644 --- a/GPU/D3D11/StateMappingD3D11.cpp +++ b/GPU/D3D11/StateMappingD3D11.cpp @@ -28,7 +28,6 @@ #include "GPU/Common/GPUStateUtils.h" #include "Core/System.h" #include "Core/Config.h" -#include "Core/Reporting.h" #include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/D3D11/DrawEngineD3D11.h" diff --git a/GPU/D3D11/TextureCacheD3D11.cpp b/GPU/D3D11/TextureCacheD3D11.cpp index b8e799b4764b..4d03f21491b1 100644 --- a/GPU/D3D11/TextureCacheD3D11.cpp +++ b/GPU/D3D11/TextureCacheD3D11.cpp @@ -23,7 +23,6 @@ #include "Common/TimeUtil.h" #include "Core/MemMap.h" -#include "Core/Reporting.h" #include "GPU/ge_constants.h" #include "GPU/GPUState.h" #include "GPU/Common/GPUStateUtils.h" diff --git a/GPU/Directx9/DrawEngineDX9.cpp b/GPU/Directx9/DrawEngineDX9.cpp index aa3f61455b7e..d164f5328e6b 100644 --- a/GPU/Directx9/DrawEngineDX9.cpp +++ b/GPU/Directx9/DrawEngineDX9.cpp @@ -22,7 +22,6 @@ #include "Common/TimeUtil.h" #include "Core/MemMap.h" #include "Core/System.h" -#include "Core/Reporting.h" #include "Core/Config.h" #include "Core/CoreTiming.h" diff --git a/GPU/Directx9/FramebufferManagerDX9.cpp b/GPU/Directx9/FramebufferManagerDX9.cpp index 87900dfbb735..da53a7b802a3 100644 --- a/GPU/Directx9/FramebufferManagerDX9.cpp +++ b/GPU/Directx9/FramebufferManagerDX9.cpp @@ -23,7 +23,6 @@ #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/System.h" -#include "Core/Reporting.h" #include "GPU/ge_constants.h" #include "GPU/GPUState.h" #include "GPU/Debugger/Stepping.h" diff --git a/GPU/Directx9/GPU_DX9.cpp b/GPU/Directx9/GPU_DX9.cpp index 2026b7098938..dec1c5f4da28 100644 --- a/GPU/Directx9/GPU_DX9.cpp +++ b/GPU/Directx9/GPU_DX9.cpp @@ -28,7 +28,6 @@ #include "Core/Host.h" #include "Core/Config.h" #include "Core/ConfigValues.h" -#include "Core/Reporting.h" #include "Core/System.h" #include "Common/GPU/D3D9/D3D9StateCache.h" @@ -44,10 +43,6 @@ #include "GPU/Directx9/DrawEngineDX9.h" #include "GPU/Directx9/TextureCacheDX9.h" -#include "Core/HLE/sceKernelThread.h" -#include "Core/HLE/sceKernelInterrupt.h" -#include "Core/HLE/sceGe.h" - GPU_DX9::GPU_DX9(GraphicsContext *gfxCtx, Draw::DrawContext *draw) : GPUCommon(gfxCtx, draw), drawEngine_(draw) { diff --git a/GPU/Directx9/ShaderManagerDX9.cpp b/GPU/Directx9/ShaderManagerDX9.cpp index 39e8c65bd7bf..8b7c2a39d0cc 100644 --- a/GPU/Directx9/ShaderManagerDX9.cpp +++ b/GPU/Directx9/ShaderManagerDX9.cpp @@ -33,11 +33,11 @@ #include "Common/CommonTypes.h" #include "Common/Log.h" +#include "Common/LogReporting.h" #include "Common/StringUtils.h" #include "Core/Config.h" #include "Core/Host.h" -#include "Core/Reporting.h" #include "GPU/Math3D.h" #include "GPU/GPUState.h" #include "GPU/ge_constants.h" diff --git a/GPU/Directx9/StateMappingDX9.cpp b/GPU/Directx9/StateMappingDX9.cpp index b97aeec37abd..5412cd9a2328 100644 --- a/GPU/Directx9/StateMappingDX9.cpp +++ b/GPU/Directx9/StateMappingDX9.cpp @@ -21,7 +21,6 @@ #include "Core/System.h" #include "Core/Config.h" -#include "Core/Reporting.h" #include "GPU/Math3D.h" #include "GPU/GPUState.h" diff --git a/GPU/Directx9/TextureCacheDX9.cpp b/GPU/Directx9/TextureCacheDX9.cpp index a280c7c590ac..93dfe2f99e52 100644 --- a/GPU/Directx9/TextureCacheDX9.cpp +++ b/GPU/Directx9/TextureCacheDX9.cpp @@ -20,7 +20,6 @@ #include "Common/TimeUtil.h" #include "Core/MemMap.h" -#include "Core/Reporting.h" #include "GPU/ge_constants.h" #include "GPU/GPUState.h" diff --git a/GPU/GLES/DepthBufferGLES.cpp b/GPU/GLES/DepthBufferGLES.cpp index 6be7ba656478..96072685eacf 100644 --- a/GPU/GLES/DepthBufferGLES.cpp +++ b/GPU/GLES/DepthBufferGLES.cpp @@ -18,8 +18,8 @@ #include #include "Common/GPU/OpenGL/GLFeatures.h" +#include "Common/LogReporting.h" #include "Core/ConfigValues.h" -#include "Core/Reporting.h" #include "GPU/Common/GPUStateUtils.h" #include "GPU/GLES/DrawEngineGLES.h" #include "GPU/GLES/FramebufferManagerGLES.h" diff --git a/GPU/GLES/DrawEngineGLES.cpp b/GPU/GLES/DrawEngineGLES.cpp index 9efb65180029..5c37ac02beaa 100644 --- a/GPU/GLES/DrawEngineGLES.cpp +++ b/GPU/GLES/DrawEngineGLES.cpp @@ -17,11 +17,11 @@ #include +#include "Common/LogReporting.h" #include "Common/MemoryUtil.h" #include "Common/TimeUtil.h" #include "Core/MemMap.h" #include "Core/System.h" -#include "Core/Reporting.h" #include "Core/Config.h" #include "Core/CoreTiming.h" diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp index 17f0f7955238..636db741a9c7 100644 --- a/GPU/GLES/GPU_GLES.cpp +++ b/GPU/GLES/GPU_GLES.cpp @@ -43,11 +43,6 @@ #include "GPU/GLES/DrawEngineGLES.h" #include "GPU/GLES/TextureCacheGLES.h" -#include "Core/MIPS/MIPS.h" -#include "Core/HLE/sceKernelThread.h" -#include "Core/HLE/sceKernelInterrupt.h" -#include "Core/HLE/sceGe.h" - #ifdef _WIN32 #include "Windows/GPU/WindowsGLContext.h" #endif diff --git a/GPU/GLES/ShaderManagerGLES.cpp b/GPU/GLES/ShaderManagerGLES.cpp index 5ebb7bf8a86d..08e1879b45cd 100644 --- a/GPU/GLES/ShaderManagerGLES.cpp +++ b/GPU/GLES/ShaderManagerGLES.cpp @@ -24,9 +24,10 @@ #include #include "Common/Data/Convert/SmallDataConvert.h" +#include "Common/Data/Text/I18n.h" #include "Common/GPU/OpenGL/GLDebugLog.h" #include "Common/GPU/OpenGL/GLFeatures.h" -#include "Common/Data/Text/I18n.h" +#include "Common/LogReporting.h" #include "Common/Math/math_util.h" #include "Common/Math/lin/matrix4x4.h" #include "Common/Profiler/Profiler.h" @@ -41,7 +42,6 @@ #include "Common/TimeUtil.h" #include "Core/Config.h" #include "Core/Host.h" -#include "Core/Reporting.h" #include "Core/System.h" #include "GPU/Math3D.h" #include "GPU/GPUState.h" diff --git a/GPU/GLES/StateMappingGLES.cpp b/GPU/GLES/StateMappingGLES.cpp index 1d06ac01e442..98af8d11f324 100644 --- a/GPU/GLES/StateMappingGLES.cpp +++ b/GPU/GLES/StateMappingGLES.cpp @@ -31,7 +31,6 @@ #include "GPU/ge_constants.h" #include "Core/System.h" #include "Core/Config.h" -#include "Core/Reporting.h" #include "GPU/GLES/GPU_GLES.h" #include "GPU/GLES/ShaderManagerGLES.h" #include "GPU/GLES/TextureCacheGLES.h" diff --git a/GPU/GLES/TextureCacheGLES.cpp b/GPU/GLES/TextureCacheGLES.cpp index 9584955d34bd..50aa9ca4ffb4 100644 --- a/GPU/GLES/TextureCacheGLES.cpp +++ b/GPU/GLES/TextureCacheGLES.cpp @@ -30,7 +30,6 @@ #include "Core/Config.h" #include "Core/Host.h" #include "Core/MemMap.h" -#include "Core/Reporting.h" #include "GPU/ge_constants.h" #include "GPU/GPUState.h" #include "GPU/GLES/TextureCacheGLES.h" diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp index c329b48e79fb..e8b81492a836 100644 --- a/GPU/GPUCommon.cpp +++ b/GPU/GPUCommon.cpp @@ -19,11 +19,11 @@ #include "Common/Data/Convert/ColorConv.h" #include "Common/GraphicsContext.h" +#include "Common/LogReporting.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/Serialize/SerializeList.h" #include "Common/TimeUtil.h" -#include "Core/Reporting.h" #include "GPU/GeDisasm.h" #include "GPU/GPU.h" #include "GPU/GPUCommon.h" diff --git a/GPU/Software/DrawPixelX86.cpp b/GPU/Software/DrawPixelX86.cpp index 2ba334df945f..f539d681d3ee 100644 --- a/GPU/Software/DrawPixelX86.cpp +++ b/GPU/Software/DrawPixelX86.cpp @@ -21,7 +21,7 @@ #include #include "Common/x64Emitter.h" #include "Common/CPUDetect.h" -#include "Core/Reporting.h" +#include "Common/LogReporting.h" #include "GPU/GPUState.h" #include "GPU/Software/DrawPixel.h" #include "GPU/Software/SoftGpu.h" diff --git a/GPU/Software/Rasterizer.cpp b/GPU/Software/Rasterizer.cpp index 4b9ed61d2762..850d4ac262e4 100644 --- a/GPU/Software/Rasterizer.cpp +++ b/GPU/Software/Rasterizer.cpp @@ -27,7 +27,6 @@ #include "Core/Config.h" #include "Core/Debugger/MemBlockInfo.h" #include "Core/MemMap.h" -#include "Core/Reporting.h" #include "GPU/GPUState.h" #include "GPU/Common/TextureDecoder.h" diff --git a/GPU/Software/RasterizerRectangle.cpp b/GPU/Software/RasterizerRectangle.cpp index d7925a66a1eb..acb2208c0613 100644 --- a/GPU/Software/RasterizerRectangle.cpp +++ b/GPU/Software/RasterizerRectangle.cpp @@ -11,7 +11,6 @@ #include "Core/Config.h" #include "Core/Debugger/MemBlockInfo.h" #include "Core/MemMap.h" -#include "Core/Reporting.h" #include "Core/System.h" #include "GPU/GPUState.h" diff --git a/GPU/Software/Sampler.cpp b/GPU/Software/Sampler.cpp index c748260dd44b..b75106ddb837 100644 --- a/GPU/Software/Sampler.cpp +++ b/GPU/Software/Sampler.cpp @@ -20,9 +20,9 @@ #include #include "Common/Common.h" #include "Common/Data/Convert/ColorConv.h" +#include "Common/LogReporting.h" #include "Common/StringUtils.h" #include "Core/Config.h" -#include "Core/Reporting.h" #include "GPU/Common/TextureDecoder.h" #include "GPU/GPUState.h" #include "GPU/Software/BinManager.h" diff --git a/GPU/Software/SoftGpu.cpp b/GPU/Software/SoftGpu.cpp index 9f7044169238..1b7a4cac825c 100644 --- a/GPU/Software/SoftGpu.cpp +++ b/GPU/Software/SoftGpu.cpp @@ -24,6 +24,7 @@ #include "GPU/Common/TextureDecoder.h" #include "Common/Data/Convert/ColorConv.h" #include "Common/GraphicsContext.h" +#include "Common/LogReporting.h" #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/Core.h" @@ -33,7 +34,6 @@ #include "Core/HLE/sceKernelInterrupt.h" #include "Core/HLE/sceGe.h" #include "Core/MIPS/MIPS.h" -#include "Core/Reporting.h" #include "Core/Util/PPGeDraw.h" #include "Common/Profiler/Profiler.h" #include "Common/GPU/thin3d.h" diff --git a/GPU/Vulkan/DrawEngineVulkan.cpp b/GPU/Vulkan/DrawEngineVulkan.cpp index 881c54cc938e..bf3462ac18cb 100644 --- a/GPU/Vulkan/DrawEngineVulkan.cpp +++ b/GPU/Vulkan/DrawEngineVulkan.cpp @@ -27,7 +27,6 @@ #include "Common/TimeUtil.h" #include "Core/MemMap.h" #include "Core/System.h" -#include "Core/Reporting.h" #include "Core/Config.h" #include "Core/CoreTiming.h" diff --git a/GPU/Vulkan/FramebufferManagerVulkan.cpp b/GPU/Vulkan/FramebufferManagerVulkan.cpp index 7061f68ae7c6..7d47fda5181c 100644 --- a/GPU/Vulkan/FramebufferManagerVulkan.cpp +++ b/GPU/Vulkan/FramebufferManagerVulkan.cpp @@ -33,7 +33,6 @@ #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/System.h" -#include "Core/Reporting.h" #include "GPU/ge_constants.h" #include "GPU/GPUInterface.h" #include "GPU/GPUState.h" diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp index b3ad3c7689ec..963482d0a6b4 100644 --- a/GPU/Vulkan/GPU_Vulkan.cpp +++ b/GPU/Vulkan/GPU_Vulkan.cpp @@ -45,11 +45,6 @@ #include "Common/GPU/Vulkan/VulkanRenderManager.h" #include "Common/GPU/Vulkan/VulkanQueueRunner.h" -#include "Core/MIPS/MIPS.h" -#include "Core/HLE/sceKernelThread.h" -#include "Core/HLE/sceKernelInterrupt.h" -#include "Core/HLE/sceGe.h" - GPU_Vulkan::GPU_Vulkan(GraphicsContext *gfxCtx, Draw::DrawContext *draw) : GPUCommon(gfxCtx, draw), drawEngine_(draw) { gstate_c.SetUseFlags(CheckGPUFeatures()); diff --git a/GPU/Vulkan/ShaderManagerVulkan.cpp b/GPU/Vulkan/ShaderManagerVulkan.cpp index bec74abcff77..8c87421a941f 100644 --- a/GPU/Vulkan/ShaderManagerVulkan.cpp +++ b/GPU/Vulkan/ShaderManagerVulkan.cpp @@ -19,6 +19,7 @@ //#define SHADERLOG #endif +#include "Common/LogReporting.h" #include "Common/Math/lin/matrix4x4.h" #include "Common/Math/math_util.h" #include "Common/Data/Convert/SmallDataConvert.h" @@ -33,7 +34,6 @@ #include "Common/Log.h" #include "Common/CommonTypes.h" #include "Core/Config.h" -#include "Core/Reporting.h" #include "GPU/Math3D.h" #include "GPU/GPUState.h" #include "GPU/ge_constants.h" diff --git a/GPU/Vulkan/StateMappingVulkan.cpp b/GPU/Vulkan/StateMappingVulkan.cpp index 90d57abd9c9c..de6a292b831d 100644 --- a/GPU/Vulkan/StateMappingVulkan.cpp +++ b/GPU/Vulkan/StateMappingVulkan.cpp @@ -27,7 +27,6 @@ #include "GPU/Common/GPUStateUtils.h" #include "Core/System.h" #include "Core/Config.h" -#include "Core/Reporting.h" #include "GPU/Vulkan/GPU_Vulkan.h" #include "GPU/Vulkan/PipelineManagerVulkan.h" #include "GPU/Vulkan/FramebufferManagerVulkan.h" diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp index 99f4641e26e9..1e43f8d35565 100644 --- a/GPU/Vulkan/TextureCacheVulkan.cpp +++ b/GPU/Vulkan/TextureCacheVulkan.cpp @@ -21,6 +21,7 @@ #include "ext/xxhash.h" #include "Common/File/VFS/VFS.h" #include "Common/Data/Text/I18n.h" +#include "Common/LogReporting.h" #include "Common/Math/math_util.h" #include "Common/Profiler/Profiler.h" #include "Common/GPU/thin3d.h" @@ -32,7 +33,6 @@ #include "Core/Config.h" #include "Core/Host.h" #include "Core/MemMap.h" -#include "Core/Reporting.h" #include "Core/System.h" #include "Common/GPU/Vulkan/VulkanContext.h" diff --git a/UI/ComboKeyMappingScreen.cpp b/UI/ComboKeyMappingScreen.cpp index 4af85552c16f..edfea23bc8a6 100644 --- a/UI/ComboKeyMappingScreen.cpp +++ b/UI/ComboKeyMappingScreen.cpp @@ -24,7 +24,6 @@ #include "Common/Data/Text/I18n.h" #include "Common/Data/Color/RGBAUtil.h" -#include "Common/File/PathBrowser.h" #include "Common/Math/curves.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 5a03804908e1..cc273ebbd11d 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -505,6 +505,8 @@ void DirButton::Draw(UIContext &dc) { GameBrowser::GameBrowser(const Path &path, BrowseFlags browseFlags, bool *gridStyle, ScreenManager *screenManager, std::string lastText, std::string lastLink, UI::LayoutParams *layoutParams) : LinearLayout(UI::ORIENT_VERTICAL, layoutParams), path_(path), gridStyle_(gridStyle), browseFlags_(browseFlags), lastText_(lastText), lastLink_(lastLink), screenManager_(screenManager) { using namespace UI; + path_.SetUserAgent(StringFromFormat("PPSSPP/%s", PPSSPP_GIT_VERSION)); + path_.SetRootAlias("ms:", GetSysDirectory(DIRECTORY_MEMSTICK_ROOT).ToVisualString()); Refresh(); } diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 0c98c0cadbda..c92ec9ce4424 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -1138,6 +1138,15 @@ void NativeRender(GraphicsContext *graphicsContext) { ui_draw2d.PushDrawMatrix(ortho); ui_draw2d_front.PushDrawMatrix(ortho); + screenManager->getUIContext()->SetTintSaturation(g_Config.fUITint, g_Config.fUISaturation); + + Draw::DebugFlags debugFlags = Draw::DebugFlags::NONE; + if (g_Config.bShowGpuProfile) + debugFlags |= Draw::DebugFlags::PROFILE_TIMESTAMPS; + if (g_Config.bGpuLogProfiler) + debugFlags |= Draw::DebugFlags::PROFILE_SCOPES; + screenManager->getDrawContext()->SetDebugFlags(debugFlags); + // All actual rendering happen in here. screenManager->render(); if (screenManager->getUIContext()->Text()) { diff --git a/UI/RemoteISOScreen.cpp b/UI/RemoteISOScreen.cpp index 93e2ae7681d3..26b5c7c36d68 100644 --- a/UI/RemoteISOScreen.cpp +++ b/UI/RemoteISOScreen.cpp @@ -40,6 +40,7 @@ #include "Common/System/System.h" #include "Common/TimeUtil.h" #include "Core/Config.h" +#include "Core/System.h" #include "Core/WebServer.h" #include "UI/RemoteISOScreen.h" @@ -247,6 +248,8 @@ bool RemoteISOConnectScreen::FindServer(std::string &resultHost, int &resultPort static bool LoadGameList(const Path &url, std::vector &games) { PathBrowser browser(url); std::vector files; + browser.SetUserAgent(StringFromFormat("PPSSPP/%s", PPSSPP_GIT_VERSION)); + browser.SetRootAlias("ms:", GetSysDirectory(DIRECTORY_MEMSTICK_ROOT).ToVisualString()); browser.GetListing(files, "iso:cso:pbp:elf:prx:ppdmp:", &scanCancelled); if (scanCancelled) { return false; diff --git a/Windows/DSoundStream.cpp b/Windows/DSoundStream.cpp index 9144a3be4f03..15a46be51474 100644 --- a/Windows/DSoundStream.cpp +++ b/Windows/DSoundStream.cpp @@ -14,7 +14,6 @@ #include "Common/Log.h" #include "Common/OSVersion.h" #include "Core/ConfigValues.h" -#include "Core/Reporting.h" #include "Core/Util/AudioFormat.h" #include "Windows/W32Util/Misc.h" diff --git a/Windows/DinputDevice.cpp b/Windows/DinputDevice.cpp index 75cb9893340d..2bdde3c89c6a 100644 --- a/Windows/DinputDevice.cpp +++ b/Windows/DinputDevice.cpp @@ -23,12 +23,12 @@ #include "Common/Input/InputState.h" #include "Common/Input/KeyCodes.h" +#include "Common/LogReporting.h" #include "Common/StringUtils.h" #include "Common/System/NativeApp.h" #include "Core/Config.h" #include "Core/HLE/sceCtrl.h" #include "Core/KeyMap.h" -#include "Core/Reporting.h" #include "Windows/DinputDevice.h" #pragma comment(lib,"dinput8.lib") diff --git a/Windows/GPU/D3D11Context.cpp b/Windows/GPU/D3D11Context.cpp index 128033f72289..6207b8fd7565 100644 --- a/Windows/GPU/D3D11Context.cpp +++ b/Windows/GPU/D3D11Context.cpp @@ -11,7 +11,6 @@ #include "Core/Config.h" #include "Core/ConfigValues.h" -#include "Core/Reporting.h" #include "Core/System.h" #include "Windows/GPU/D3D11Context.h" #include "Windows/W32Util/Misc.h" diff --git a/Windows/GPU/D3D9Context.cpp b/Windows/GPU/D3D9Context.cpp index 7c1f4868e930..dc02dade21cd 100644 --- a/Windows/GPU/D3D9Context.cpp +++ b/Windows/GPU/D3D9Context.cpp @@ -13,7 +13,6 @@ #include "Core/Config.h" #include "Core/ConfigValues.h" -#include "Core/Reporting.h" #include "Core/System.h" #include "Common/OSVersion.h" #include "Windows/GPU/D3D9Context.h" diff --git a/Windows/WASAPIStream.cpp b/Windows/WASAPIStream.cpp index 53f02245b920..ffc9e7abe6cd 100644 --- a/Windows/WASAPIStream.cpp +++ b/Windows/WASAPIStream.cpp @@ -3,8 +3,8 @@ #include "WindowsAudio.h" #include "WASAPIStream.h" #include "Common/Log.h" +#include "Common/LogReporting.h" #include "Core/Config.h" -#include "Core/Reporting.h" #include "Core/Util/AudioFormat.h" #include "Common/Data/Encoding/Utf8.h"