diff --git a/GPU/Common/FramebufferCommon.cpp b/GPU/Common/FramebufferCommon.cpp index 1a3fab51ea..f5123826ae 100644 --- a/GPU/Common/FramebufferCommon.cpp +++ b/GPU/Common/FramebufferCommon.cpp @@ -21,7 +21,6 @@ #include #include "ext/native/thin3d/thin3d.h" -#include "base/timeutil.h" #include "gfx_es2/gpu_features.h" #include "i18n/i18n.h" @@ -32,7 +31,6 @@ #include "Core/CoreParameter.h" #include "Core/Host.h" #include "Core/Reporting.h" -#include "Core/ELF/ParamSFO.h" #include "Core/System.h" #include "GPU/Common/DrawEngineCommon.h" #include "GPU/Common/FramebufferCommon.h" diff --git a/GPU/Common/FramebufferCommon.h b/GPU/Common/FramebufferCommon.h index b2e132cb7d..6f89fb0db5 100644 --- a/GPU/Common/FramebufferCommon.h +++ b/GPU/Common/FramebufferCommon.h @@ -176,7 +176,6 @@ class DrawContext; } struct GPUDebugBuffer; -struct PostShaderUniforms; class DrawEngineCommon; class PresentationCommon; class ShaderManagerCommon; diff --git a/GPU/D3D11/FramebufferManagerD3D11.cpp b/GPU/D3D11/FramebufferManagerD3D11.cpp index 27fe422d08..5098a4c114 100644 --- a/GPU/D3D11/FramebufferManagerD3D11.cpp +++ b/GPU/D3D11/FramebufferManagerD3D11.cpp @@ -15,6 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include #include #include @@ -22,12 +23,9 @@ #include "math/lin/matrix4x4.h" #include "ext/native/thin3d/thin3d.h" #include "base/basictypes.h" -#include "file/vfs.h" -#include "file/zip_read.h" #include "Common/ColorConv.h" #include "Common/MathUtil.h" -#include "Core/Host.h" #include "Core/MemMap.h" #include "Core/Config.h" #include "Core/ConfigValues.h" @@ -38,7 +36,6 @@ #include "GPU/Debugger/Stepping.h" #include "GPU/Common/FramebufferCommon.h" -#include "GPU/Common/PostShader.h" #include "GPU/Common/PresentationCommon.h" #include "GPU/Common/ShaderTranslation.h" #include "GPU/Common/TextureDecoder.h" @@ -47,10 +44,6 @@ #include "GPU/D3D11/TextureCacheD3D11.h" #include "GPU/D3D11/DrawEngineD3D11.h" -#include "ext/native/thin3d/thin3d.h" - -#include - #ifdef _M_SSE #include #endif diff --git a/GPU/D3D11/FramebufferManagerD3D11.h b/GPU/D3D11/FramebufferManagerD3D11.h index d1c0e2440a..ef86098ae3 100644 --- a/GPU/D3D11/FramebufferManagerD3D11.h +++ b/GPU/D3D11/FramebufferManagerD3D11.h @@ -25,7 +25,6 @@ #include "GPU/GPUCommon.h" #include "GPU/Common/FramebufferCommon.h" -#include "Core/Config.h" #include "ext/native/thin3d/thin3d.h" class TextureCacheD3D11; @@ -98,7 +97,6 @@ private: u8 *convBuf = nullptr; - int plainColorLoc_; ID3D11PixelShader *stencilUploadPS_ = nullptr; ID3D11VertexShader *stencilUploadVS_ = nullptr; ID3D11InputLayout *stencilUploadInputLayout_ = nullptr; @@ -111,8 +109,4 @@ private: TextureCacheD3D11 *textureCacheD3D11_; ShaderManagerD3D11 *shaderManagerD3D11_; DrawEngineD3D11 *drawEngineD3D11_; - - // Used by post-processing shader - // Postprocessing - static const D3D11_INPUT_ELEMENT_DESC g_PostVertexElements[2]; }; diff --git a/GPU/Directx9/FramebufferDX9.cpp b/GPU/Directx9/FramebufferDX9.cpp index 579c00f42b..ea82a07f99 100644 --- a/GPU/Directx9/FramebufferDX9.cpp +++ b/GPU/Directx9/FramebufferDX9.cpp @@ -19,7 +19,6 @@ #include "ext/native/thin3d/thin3d.h" #include "Common/ColorConv.h" -#include "Core/Host.h" #include "Core/MemMap.h" #include "Core/Config.h" #include "Core/ConfigValues.h" diff --git a/GPU/Directx9/FramebufferDX9.h b/GPU/Directx9/FramebufferDX9.h index b84e548f0d..1ab874caf5 100644 --- a/GPU/Directx9/FramebufferDX9.h +++ b/GPU/Directx9/FramebufferDX9.h @@ -27,7 +27,6 @@ #include "GPU/GPUCommon.h" #include "GPU/Common/FramebufferCommon.h" -#include "Core/Config.h" #include "ext/native/thin3d/thin3d.h" namespace DX9 { @@ -97,7 +96,6 @@ private: u8 *convBuf = nullptr; - int plainColorLoc_; LPDIRECT3DPIXELSHADER9 stencilUploadPS_ = nullptr; LPDIRECT3DVERTEXSHADER9 stencilUploadVS_ = nullptr; bool stencilUploadFailed_ = false; diff --git a/GPU/GLES/FramebufferManagerGLES.cpp b/GPU/GLES/FramebufferManagerGLES.cpp index 5b331b8b9a..de34febdc6 100644 --- a/GPU/GLES/FramebufferManagerGLES.cpp +++ b/GPU/GLES/FramebufferManagerGLES.cpp @@ -23,13 +23,7 @@ #include "gfx/gl_debug_log.h" #include "gfx_es2/glsl_program.h" #include "thin3d/thin3d.h" - -#include "base/timeutil.h" -#include "file/vfs.h" -#include "math/lin/matrix4x4.h" - #include "Common/ColorConv.h" -#include "Core/Host.h" #include "Core/MemMap.h" #include "Core/Config.h" #include "Core/ConfigValues.h" @@ -38,9 +32,7 @@ #include "GPU/ge_constants.h" #include "GPU/GPUState.h" #include "GPU/Common/FramebufferCommon.h" -#include "GPU/Common/PostShader.h" #include "GPU/Common/PresentationCommon.h" -#include "GPU/Common/ShaderTranslation.h" #include "GPU/Common/TextureDecoder.h" #include "GPU/Debugger/Stepping.h" #include "GPU/GLES/FramebufferManagerGLES.h" @@ -158,11 +150,6 @@ void FramebufferManagerGLES::DestroyDeviceObjects() { render_->DeleteProgram(draw2dprogram_); draw2dprogram_ = nullptr; } - // Will usually be clear already. - for (auto iter : postShaderModules_) { - render_->DeleteShader(iter); - } - postShaderModules_.clear(); if (drawPixelsTex_) { render_->DeleteTexture(drawPixelsTex_); drawPixelsTex_ = 0; diff --git a/GPU/GLES/FramebufferManagerGLES.h b/GPU/GLES/FramebufferManagerGLES.h index 22e2f25445..05a6ae366f 100644 --- a/GPU/GLES/FramebufferManagerGLES.h +++ b/GPU/GLES/FramebufferManagerGLES.h @@ -22,7 +22,6 @@ // Also provides facilities for drawing and later converting raw // pixel data. -#include "Core/Config.h" #include "GPU/GPUCommon.h" #include "GPU/Common/FramebufferCommon.h" #include "thin3d/GLRenderManager.h" @@ -91,12 +90,10 @@ private: u8 *convBuf_ = nullptr; u32 convBufSize_ = 0; GLRProgram *draw2dprogram_ = nullptr; - std::vector postShaderModules_; GLRProgram *stencilUploadProgram_ = nullptr; int u_stencilUploadTex = -1; int u_stencilValue = -1; - int u_postShaderTex = -1; GLRProgram *depthDownloadProgram_ = nullptr; int u_depthDownloadTex = -1; @@ -107,12 +104,6 @@ private: // Cached uniform locs int u_draw2d_tex = -1; - int plainColorLoc_ = -1; - int videoLoc_ = -1; - int timeLoc_ = -1; - int pixelDeltaLoc_ = -1; - int deltaLoc_ = -1; - TextureCacheGLES *textureCacheGL_ = nullptr; ShaderManagerGLES *shaderManagerGL_ = nullptr; DrawEngineGLES *drawEngineGL_ = nullptr; diff --git a/GPU/Vulkan/FramebufferVulkan.cpp b/GPU/Vulkan/FramebufferVulkan.cpp index 6fbd57214b..347bd63369 100644 --- a/GPU/Vulkan/FramebufferVulkan.cpp +++ b/GPU/Vulkan/FramebufferVulkan.cpp @@ -21,10 +21,8 @@ #include "profiler/profiler.h" #include "base/display.h" -#include "base/timeutil.h" #include "math/lin/matrix4x4.h" #include "math/dataconv.h" -#include "ext/native/file/vfs.h" #include "ext/native/thin3d/thin3d.h" #include "Common/Vulkan/VulkanContext.h" @@ -32,7 +30,6 @@ #include "Common/Vulkan/VulkanImage.h" #include "thin3d/VulkanRenderManager.h" #include "Common/ColorConv.h" -#include "Core/Host.h" #include "Core/MemMap.h" #include "Core/Config.h" #include "Core/ConfigValues.h" @@ -40,17 +37,12 @@ #include "Core/Reporting.h" #include "Core/HLE/sceDisplay.h" #include "GPU/ge_constants.h" +#include "GPU/GPUInterface.h" #include "GPU/GPUState.h" -#include "GPU/Common/ShaderTranslation.h" -#include "GPU/Common/PostShader.h" #include "GPU/Common/TextureDecoder.h" #include "GPU/Common/FramebufferCommon.h" #include "GPU/Debugger/Stepping.h" - -#include "GPU/GPUInterface.h" -#include "GPU/GPUState.h" -#include "Common/Vulkan/VulkanImage.h" #include "GPU/Vulkan/FramebufferVulkan.h" #include "GPU/Vulkan/DrawEngineVulkan.h" #include "GPU/Vulkan/TextureCacheVulkan.h" diff --git a/GPU/Vulkan/FramebufferVulkan.h b/GPU/Vulkan/FramebufferVulkan.h index be5a08b8c5..25d44caf31 100644 --- a/GPU/Vulkan/FramebufferVulkan.h +++ b/GPU/Vulkan/FramebufferVulkan.h @@ -104,9 +104,6 @@ private: MAX_COMMAND_BUFFERS = 32, }; - // This gets copied to the current frame's push buffer as needed. - PostShaderUniforms postUniforms_; - VkPipelineCache pipelineCache2D_; // Basic shaders @@ -116,7 +113,6 @@ private: VkShaderModule stencilVs_ = VK_NULL_HANDLE; VkShaderModule stencilFs_ = VK_NULL_HANDLE; - VkPipeline cur2DPipeline_ = VK_NULL_HANDLE; VkSampler linearSampler_;