From d57edfbdaca42c1ac3838683a569859b3842c4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 3 Aug 2020 23:17:22 +0200 Subject: [PATCH] Rename FramebufferCommon.cpp/h to FramebufferManagerCommon.cpp/h for consistency --- CMakeLists.txt | 4 ++-- Core/Config.cpp | 2 +- Core/HLE/sceDisplay.cpp | 2 +- ...bufferCommon.cpp => FramebufferManagerCommon.cpp} | 2 +- ...ramebufferCommon.h => FramebufferManagerCommon.h} | 0 GPU/Common/GPUStateUtils.cpp | 2 +- GPU/Common/ShaderUniforms.cpp | 2 +- GPU/Common/SoftwareTransformCommon.cpp | 2 +- GPU/Common/TextureCacheCommon.cpp | 2 +- GPU/D3D11/FramebufferManagerD3D11.cpp | 2 +- GPU/D3D11/FramebufferManagerD3D11.h | 2 +- GPU/D3D11/GPU_D3D11.cpp | 2 +- GPU/D3D11/StateMappingD3D11.cpp | 2 +- GPU/D3D11/TextureCacheD3D11.cpp | 2 +- GPU/Directx9/FramebufferDX9.cpp | 2 +- GPU/Directx9/FramebufferDX9.h | 2 +- GPU/Directx9/GPU_DX9.cpp | 2 +- GPU/Directx9/TextureCacheDX9.cpp | 2 +- GPU/GLES/FramebufferManagerGLES.cpp | 2 +- GPU/GLES/FramebufferManagerGLES.h | 2 +- GPU/GLES/GPU_GLES.cpp | 2 +- GPU/GPU.vcxproj | 4 ++-- GPU/GPU.vcxproj.filters | 12 ++++++------ GPU/GPUCommon.cpp | 2 +- GPU/Vulkan/FramebufferVulkan.cpp | 2 +- GPU/Vulkan/FramebufferVulkan.h | 2 +- GPU/Vulkan/GPU_Vulkan.cpp | 2 +- UI/DisplayLayoutScreen.cpp | 2 +- UI/EmuScreen.cpp | 2 +- UI/GameSettingsScreen.cpp | 2 +- UWP/GPU_UWP/GPU_UWP.vcxproj | 6 +++--- UWP/GPU_UWP/GPU_UWP.vcxproj.filters | 6 +++--- Windows/MainWindowMenu.cpp | 2 +- android/jni/Android.mk | 2 +- headless/Headless.cpp | 2 +- libretro/Makefile.common | 2 +- libretro/libretro.cpp | 2 +- 37 files changed, 47 insertions(+), 47 deletions(-) rename GPU/Common/{FramebufferCommon.cpp => FramebufferManagerCommon.cpp} (99%) rename GPU/Common/{FramebufferCommon.h => FramebufferManagerCommon.h} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b07111e86..e06deae2cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1352,8 +1352,8 @@ set(GPU_SOURCES ${GPU_NEON} GPU/Common/DepalettizeShaderCommon.cpp GPU/Common/DepalettizeShaderCommon.h - GPU/Common/FramebufferCommon.cpp - GPU/Common/FramebufferCommon.h + GPU/Common/FramebufferManagerCommon.cpp + GPU/Common/FramebufferManagerCommon.h GPU/Common/GPUDebugInterface.cpp GPU/Common/GPUDebugInterface.h GPU/Common/GPUStateUtils.cpp diff --git a/Core/Config.cpp b/Core/Config.cpp index db67ba515b..d28e9c2494 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -43,7 +43,7 @@ #include "Core/Loaders.h" #include "Core/HLE/sceUtility.h" #include "Core/Instance.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" // TODO: Find a better place for this. http::Downloader g_DownloadManager; diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index 12c069ab0e..305339d86c 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -55,7 +55,7 @@ #include "GPU/GPU.h" #include "GPU/GPUState.h" #include "GPU/GPUInterface.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/PostShader.h" #include "GPU/Debugger/Record.h" diff --git a/GPU/Common/FramebufferCommon.cpp b/GPU/Common/FramebufferManagerCommon.cpp similarity index 99% rename from GPU/Common/FramebufferCommon.cpp rename to GPU/Common/FramebufferManagerCommon.cpp index 9dab512165..c93f838e18 100644 --- a/GPU/Common/FramebufferCommon.cpp +++ b/GPU/Common/FramebufferManagerCommon.cpp @@ -33,7 +33,7 @@ #include "Core/Host.h" #include "Core/Reporting.h" #include "GPU/Common/DrawEngineCommon.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/PostShader.h" #include "GPU/Common/PresentationCommon.h" #include "GPU/Common/TextureCacheCommon.h" diff --git a/GPU/Common/FramebufferCommon.h b/GPU/Common/FramebufferManagerCommon.h similarity index 100% rename from GPU/Common/FramebufferCommon.h rename to GPU/Common/FramebufferManagerCommon.h diff --git a/GPU/Common/GPUStateUtils.cpp b/GPU/Common/GPUStateUtils.cpp index 5406f9d360..bf95736774 100644 --- a/GPU/Common/GPUStateUtils.cpp +++ b/GPU/Common/GPUStateUtils.cpp @@ -28,7 +28,7 @@ #include "GPU/ge_constants.h" #include "GPU/GPUState.h" #include "GPU/Math3D.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/PresentationCommon.h" #include "GPU/Common/ShaderId.h" #include "GPU/Common/VertexDecoderCommon.h" diff --git a/GPU/Common/ShaderUniforms.cpp b/GPU/Common/ShaderUniforms.cpp index be3391cc90..c80ae842ef 100644 --- a/GPU/Common/ShaderUniforms.cpp +++ b/GPU/Common/ShaderUniforms.cpp @@ -8,7 +8,7 @@ #include "math/math_util.h" #include "math/lin/vec3.h" #include "GPU/GPUState.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/GPUStateUtils.h" #include "GPU/Math3D.h" diff --git a/GPU/Common/SoftwareTransformCommon.cpp b/GPU/Common/SoftwareTransformCommon.cpp index 2c14865a6b..c7e18fff21 100644 --- a/GPU/Common/SoftwareTransformCommon.cpp +++ b/GPU/Common/SoftwareTransformCommon.cpp @@ -23,7 +23,7 @@ #include "Core/Config.h" #include "GPU/GPUState.h" #include "GPU/Math3D.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/GPUStateUtils.h" #include "GPU/Common/SoftwareTransformCommon.h" #include "GPU/Common/TransformCommon.h" diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp index 8680f33f1b..462e72fc63 100644 --- a/GPU/Common/TextureCacheCommon.cpp +++ b/GPU/Common/TextureCacheCommon.cpp @@ -23,7 +23,7 @@ #include "Core/Config.h" #include "Core/Reporting.h" #include "Core/System.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/TextureCacheCommon.h" #include "GPU/Common/TextureDecoder.h" #include "GPU/Common/ShaderId.h" diff --git a/GPU/D3D11/FramebufferManagerD3D11.cpp b/GPU/D3D11/FramebufferManagerD3D11.cpp index 1ec5128cdb..74ded8bc75 100644 --- a/GPU/D3D11/FramebufferManagerD3D11.cpp +++ b/GPU/D3D11/FramebufferManagerD3D11.cpp @@ -35,7 +35,7 @@ #include "GPU/GPUState.h" #include "GPU/Debugger/Stepping.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/PresentationCommon.h" #include "GPU/Common/ShaderTranslation.h" #include "GPU/Common/TextureDecoder.h" diff --git a/GPU/D3D11/FramebufferManagerD3D11.h b/GPU/D3D11/FramebufferManagerD3D11.h index 1f91af61ae..a1683c299c 100644 --- a/GPU/D3D11/FramebufferManagerD3D11.h +++ b/GPU/D3D11/FramebufferManagerD3D11.h @@ -24,7 +24,7 @@ // pixel data. #include "GPU/GPUCommon.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "ext/native/thin3d/thin3d.h" class TextureCacheD3D11; diff --git a/GPU/D3D11/GPU_D3D11.cpp b/GPU/D3D11/GPU_D3D11.cpp index 6e497064c7..13cbb442fc 100644 --- a/GPU/D3D11/GPU_D3D11.cpp +++ b/GPU/D3D11/GPU_D3D11.cpp @@ -53,7 +53,7 @@ #include "GPU/ge_constants.h" #include "GPU/GeDisasm.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Debugger/Debugger.h" #include "GPU/D3D11/ShaderManagerD3D11.h" #include "GPU/D3D11/GPU_D3D11.h" diff --git a/GPU/D3D11/StateMappingD3D11.cpp b/GPU/D3D11/StateMappingD3D11.cpp index 51674571c8..cb10fd96f2 100644 --- a/GPU/D3D11/StateMappingD3D11.cpp +++ b/GPU/D3D11/StateMappingD3D11.cpp @@ -28,7 +28,7 @@ #include "Core/Config.h" #include "Core/Reporting.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/D3D11/DrawEngineD3D11.h" #include "GPU/D3D11/StateMappingD3D11.h" #include "GPU/D3D11/FramebufferManagerD3D11.h" diff --git a/GPU/D3D11/TextureCacheD3D11.cpp b/GPU/D3D11/TextureCacheD3D11.cpp index 4b342eb296..70fee76b59 100644 --- a/GPU/D3D11/TextureCacheD3D11.cpp +++ b/GPU/D3D11/TextureCacheD3D11.cpp @@ -32,7 +32,7 @@ #include "GPU/D3D11/ShaderManagerD3D11.h" #include "GPU/D3D11/DepalettizeShaderD3D11.h" #include "GPU/D3D11/D3D11Util.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/TextureDecoder.h" #include "Core/Config.h" #include "Core/Host.h" diff --git a/GPU/Directx9/FramebufferDX9.cpp b/GPU/Directx9/FramebufferDX9.cpp index c3cb5ff1dd..53123b8255 100644 --- a/GPU/Directx9/FramebufferDX9.cpp +++ b/GPU/Directx9/FramebufferDX9.cpp @@ -29,7 +29,7 @@ #include "GPU/Debugger/Stepping.h" #include "gfx/d3d9_state.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/PresentationCommon.h" #include "GPU/Common/ShaderTranslation.h" #include "GPU/Common/TextureDecoder.h" diff --git a/GPU/Directx9/FramebufferDX9.h b/GPU/Directx9/FramebufferDX9.h index d311c8aa78..b164a9b0e7 100644 --- a/GPU/Directx9/FramebufferDX9.h +++ b/GPU/Directx9/FramebufferDX9.h @@ -26,7 +26,7 @@ // pixel data. #include "GPU/GPUCommon.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" namespace DX9 { diff --git a/GPU/Directx9/GPU_DX9.cpp b/GPU/Directx9/GPU_DX9.cpp index a51db99ca4..502f20205b 100644 --- a/GPU/Directx9/GPU_DX9.cpp +++ b/GPU/Directx9/GPU_DX9.cpp @@ -38,7 +38,7 @@ #include "GPU/ge_constants.h" #include "GPU/GeDisasm.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Debugger/Debugger.h" #include "GPU/Directx9/ShaderManagerDX9.h" #include "GPU/Directx9/GPU_DX9.h" diff --git a/GPU/Directx9/TextureCacheDX9.cpp b/GPU/Directx9/TextureCacheDX9.cpp index e10aff8cc2..2cbfaa978e 100644 --- a/GPU/Directx9/TextureCacheDX9.cpp +++ b/GPU/Directx9/TextureCacheDX9.cpp @@ -30,7 +30,7 @@ #include "GPU/Directx9/ShaderManagerDX9.h" #include "GPU/Directx9/DepalettizeShaderDX9.h" #include "gfx/d3d9_state.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/TextureDecoder.h" #include "Core/Config.h" #include "Core/Host.h" diff --git a/GPU/GLES/FramebufferManagerGLES.cpp b/GPU/GLES/FramebufferManagerGLES.cpp index d3ae9616c7..3d28e9bc98 100644 --- a/GPU/GLES/FramebufferManagerGLES.cpp +++ b/GPU/GLES/FramebufferManagerGLES.cpp @@ -31,7 +31,7 @@ #include "Core/Reporting.h" #include "GPU/ge_constants.h" #include "GPU/GPUState.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/PresentationCommon.h" #include "GPU/Common/TextureDecoder.h" #include "GPU/Debugger/Stepping.h" diff --git a/GPU/GLES/FramebufferManagerGLES.h b/GPU/GLES/FramebufferManagerGLES.h index f86fb1218f..12a3eb85c5 100644 --- a/GPU/GLES/FramebufferManagerGLES.h +++ b/GPU/GLES/FramebufferManagerGLES.h @@ -23,7 +23,7 @@ // pixel data. #include "GPU/GPUCommon.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "thin3d/GLRenderManager.h" struct GLSLProgram; diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp index 64f872d3a0..0d4e0035e3 100644 --- a/GPU/GLES/GPU_GLES.cpp +++ b/GPU/GLES/GPU_GLES.cpp @@ -34,7 +34,7 @@ #include "GPU/GPUState.h" #include "GPU/ge_constants.h" #include "GPU/GeDisasm.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Debugger/Debugger.h" #include "GPU/GLES/ShaderManagerGLES.h" #include "GPU/GLES/GPU_GLES.h" diff --git a/GPU/GPU.vcxproj b/GPU/GPU.vcxproj index e427e500bf..e9c82cba8d 100644 --- a/GPU/GPU.vcxproj +++ b/GPU/GPU.vcxproj @@ -340,7 +340,7 @@ - + @@ -493,7 +493,7 @@ - + diff --git a/GPU/GPU.vcxproj.filters b/GPU/GPU.vcxproj.filters index e5e6f1a0e7..3935a822bc 100644 --- a/GPU/GPU.vcxproj.filters +++ b/GPU/GPU.vcxproj.filters @@ -129,9 +129,6 @@ Common - - Common - Common @@ -288,6 +285,9 @@ Common + + Common + @@ -383,9 +383,6 @@ Common - - Common - Common @@ -572,5 +569,8 @@ Common + + Common + \ No newline at end of file diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp index 190a4fd2db..73278fb103 100644 --- a/GPU/GPUCommon.cpp +++ b/GPU/GPUCommon.cpp @@ -26,7 +26,7 @@ #include "Core/Debugger/Breakpoints.h" #include "Core/MemMapHelpers.h" #include "GPU/Common/DrawEngineCommon.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/SplineCommon.h" #include "GPU/Common/TextureCacheCommon.h" #include "GPU/Debugger/Debugger.h" diff --git a/GPU/Vulkan/FramebufferVulkan.cpp b/GPU/Vulkan/FramebufferVulkan.cpp index 7fb74a2f96..430b37987a 100644 --- a/GPU/Vulkan/FramebufferVulkan.cpp +++ b/GPU/Vulkan/FramebufferVulkan.cpp @@ -41,7 +41,7 @@ #include "GPU/GPUState.h" #include "GPU/Common/TextureDecoder.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Debugger/Stepping.h" #include "GPU/Vulkan/FramebufferVulkan.h" #include "GPU/Vulkan/DrawEngineVulkan.h" diff --git a/GPU/Vulkan/FramebufferVulkan.h b/GPU/Vulkan/FramebufferVulkan.h index 622ad28164..b66eeb6033 100644 --- a/GPU/Vulkan/FramebufferVulkan.h +++ b/GPU/Vulkan/FramebufferVulkan.h @@ -19,7 +19,7 @@ #include "Common/Vulkan/VulkanLoader.h" #include "GPU/GPUInterface.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/GPUDebugInterface.h" #include "GPU/Common/PresentationCommon.h" #include "GPU/Vulkan/VulkanUtil.h" diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp index b0e4ebf641..17a7e89563 100644 --- a/GPU/Vulkan/GPU_Vulkan.cpp +++ b/GPU/Vulkan/GPU_Vulkan.cpp @@ -35,7 +35,7 @@ #include "GPU/GPUState.h" #include "GPU/ge_constants.h" #include "GPU/GeDisasm.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Debugger/Debugger.h" #include "GPU/Vulkan/ShaderManagerVulkan.h" #include "GPU/Vulkan/GPU_Vulkan.h" diff --git a/UI/DisplayLayoutScreen.cpp b/UI/DisplayLayoutScreen.cpp index 7b210c2c85..7dba4e28ed 100644 --- a/UI/DisplayLayoutScreen.cpp +++ b/UI/DisplayLayoutScreen.cpp @@ -31,7 +31,7 @@ #include "Core/ConfigValues.h" #include "Core/System.h" #include "DisplayLayoutEditor.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" static const int leftColumnWidth = 200; static const float orgRatio = 1.764706f; diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index a2b476fa25..08476fbad0 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -52,7 +52,7 @@ #include "Core/System.h" #include "GPU/GPUState.h" #include "GPU/GPUInterface.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #if !PPSSPP_PLATFORM(UWP) #include "GPU/Vulkan/DebugVisVulkan.h" #endif diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index e0c8d2750f..5594e2e035 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -64,7 +64,7 @@ #include "GPU/Common/PostShader.h" #include "android/jni/TestRunner.h" #include "GPU/GPUInterface.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #if defined(_WIN32) && !PPSSPP_PLATFORM(UWP) #pragma warning(disable:4091) // workaround bug in VS2015 headers diff --git a/UWP/GPU_UWP/GPU_UWP.vcxproj b/UWP/GPU_UWP/GPU_UWP.vcxproj index 356e226e26..0a0e4ee197 100644 --- a/UWP/GPU_UWP/GPU_UWP.vcxproj +++ b/UWP/GPU_UWP/GPU_UWP.vcxproj @@ -381,7 +381,7 @@ - + @@ -440,7 +440,7 @@ - + @@ -526,4 +526,4 @@ - \ No newline at end of file + diff --git a/UWP/GPU_UWP/GPU_UWP.vcxproj.filters b/UWP/GPU_UWP/GPU_UWP.vcxproj.filters index c72d9173e4..3c47339764 100644 --- a/UWP/GPU_UWP/GPU_UWP.vcxproj.filters +++ b/UWP/GPU_UWP/GPU_UWP.vcxproj.filters @@ -3,7 +3,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -118,4 +118,4 @@ - \ No newline at end of file + diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index e95816204a..6a3447cdc3 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -23,7 +23,7 @@ #endif #include "UI/OnScreenDisplay.h" #include "GPU/Common/PostShader.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/TextureCacheCommon.h" #include "GPU/Common/TextureScalerCommon.h" diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 3df8536529..b1eb79d940 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -227,7 +227,7 @@ EXEC_AND_LIB_FILES := \ $(SRC)/GPU/GPUState.cpp \ $(SRC)/GPU/GeDisasm.cpp \ $(SRC)/GPU/Common/DepalettizeShaderCommon.cpp \ - $(SRC)/GPU/Common/FramebufferCommon.cpp \ + $(SRC)/GPU/Common/FramebufferManagerCommon.cpp \ $(SRC)/GPU/Common/PresentationCommon.cpp \ $(SRC)/GPU/Common/GPUDebugInterface.cpp \ $(SRC)/GPU/Common/IndexGenerator.cpp.arm \ diff --git a/headless/Headless.cpp b/headless/Headless.cpp index 8246a7df43..77af343446 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -21,7 +21,7 @@ #include "Core/HLE/sceUtility.h" #include "Core/Host.h" #include "Core/SaveState.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "Log.h" #include "LogManager.h" #include "base/NativeApp.h" diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 7d44b4402f..fd5293aa7a 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -162,7 +162,7 @@ SOURCES_CXX += \ $(GPUCOMMONDIR)/GPUStateUtils.cpp \ $(GPUCOMMONDIR)/DrawEngineCommon.cpp \ $(GPUCOMMONDIR)/SplineCommon.cpp \ - $(GPUCOMMONDIR)/FramebufferCommon.cpp \ + $(GPUCOMMONDIR)/FramebufferManagerCommon.cpp \ $(GPUCOMMONDIR)/PresentationCommon.cpp \ $(GPUCOMMONDIR)/ShaderId.cpp \ $(GPUCOMMONDIR)/ShaderCommon.cpp \ diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index 2a962377a3..2c782a4b3c 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -24,7 +24,7 @@ #include "file/zip_read.h" #include "GPU/GPUState.h" #include "GPU/GPUInterface.h" -#include "GPU/Common/FramebufferCommon.h" +#include "GPU/Common/FramebufferManagerCommon.h" #include "GPU/Common/TextureScalerCommon.h" #include "input/input_state.h" #include "base/NativeApp.h"