Move Display.cpp/h to Common.

2025-04-02 11:01:50 -04:00 · 2020-10-04 10:10:55 +02:00 · 2020-10-04 10:10:55 +02:00 · b7edf75437
commit b7edf75437
parent 821817e6d4
70 changed files with 91 additions and 124 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -493,6 +493,8 @@ add_library(Common STATIC
 	Common/Math/math_util.h
 	Common/Profiler/Profiler.cpp
 	Common/Profiler/Profiler.h
+	Common/System/Display.cpp
+	Common/System/Display.h
 	Common/Thread/Executor.cpp
 	Common/Thread/Executor.h
 	Common/Thread/PrioritizedWorkQueue.cpp
@ -1010,8 +1012,6 @@ endif()

 add_library(native STATIC
 	${nativeExtra}
-	ext/native/base/display.cpp
-	ext/native/base/display.h
 	ext/native/file/fd_util.cpp
 	ext/native/file/fd_util.h
 	ext/native/file/file_util.cpp
--- a/Common/Common.vcxproj.filters
+++ b/Common/Common.vcxproj.filters
@ -513,6 +513,9 @@
    <Filter Include="Profiler">
      <UniqueIdentifier>{8321632b-8fc5-4a67-adb7-126a328d50eb}</UniqueIdentifier>
    </Filter>
+    <Filter Include="System">
+      <UniqueIdentifier>{89ddf0bd-3fc4-4a69-87a7-b82cfc412e0a}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <Text Include="..\ext\libpng17\CMakeLists.txt">
--- a/ext/native/base/display.cpp
+++ b/ext/native/base/display.cpp
@ -1,4 +1,4 @@
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Math/math_util.h"

 int dp_xres;
--- a/ext/native/base/display.h
+++ b/ext/native/base/display.h
--- a/Common/Vulkan/VulkanContext.cpp
+++ b/Common/Vulkan/VulkanContext.cpp
@ -5,7 +5,7 @@
 #include <cstring>
 #include <iostream>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Log.h"
 #include "Common/Vulkan/VulkanContext.h"
 #include "Common/Vulkan/VulkanDebug.h"
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@ -24,7 +24,7 @@

 #include "ppsspp_config.h"

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "gfx_es2/gpu_features.h"
 #include "net/http_client.h"
--- a/Core/Core.cpp
+++ b/Core/Core.cpp
@ -23,7 +23,7 @@
 #include <condition_variable>

 #include "base/NativeApp.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/TimeUtil.h"
 #include "Common/Thread/ThreadUtil.h"
 #include "Common/Profiler/Profiler.h"
--- a/GPU/Common/GPUStateUtils.cpp
+++ b/GPU/Common/GPUStateUtils.cpp
@ -18,7 +18,7 @@
 #include <algorithm>
 #include <limits>

-#include "base/display.h"
+#include "Common/System/Display.h"

 #include "Common/StringUtils.h"
 #include "Core/Config.h"
--- a/GPU/Common/PresentationCommon.cpp
+++ b/GPU/Common/PresentationCommon.cpp
@ -19,7 +19,7 @@
 #include <set>
 #include <cstdint>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "thin3d/thin3d.h"

--- a/GPU/Common/ShaderUniforms.cpp
+++ b/GPU/Common/ShaderUniforms.cpp
@ -2,7 +2,7 @@
 #include <cmath>

 #include "ShaderUniforms.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Data/Convert/SmallDataConvert.h"
 #include "Common/Math/lin/matrix4x4.h"
 #include "Common/Math/math_util.h"
--- a/GPU/D3D11/FramebufferManagerD3D11.cpp
+++ b/GPU/D3D11/FramebufferManagerD3D11.cpp
@ -19,7 +19,7 @@
 #include <d3d11.h>
 #include <D3Dcompiler.h>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Math/lin/matrix4x4.h"
 #include "ext/native/thin3d/thin3d.h"

--- a/GPU/Software/SoftGpu.cpp
+++ b/GPU/Software/SoftGpu.cpp
@ -15,7 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "gfx_es2/gpu_features.h"

 #include "GPU/GPUState.h"
--- a/GPU/Vulkan/FramebufferManagerVulkan.cpp
+++ b/GPU/Vulkan/FramebufferManagerVulkan.cpp
@ -19,7 +19,7 @@

 #include "Common/Profiler/Profiler.h"

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Math/lin/matrix4x4.h"
 #include "Common/Data/Convert/SmallDataConvert.h"
 #include "ext/native/thin3d/thin3d.h"
--- a/Qt/QtMain.h
+++ b/Qt/QtMain.h
@ -22,7 +22,7 @@ QTM_USE_NAMESPACE
 #include <atomic>
 #include <thread>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/TimeUtil.h"
 #include "file/zip_read.h"
 #include "gfx/gl_common.h"
--- a/Qt/mainwindow.cpp
+++ b/Qt/mainwindow.cpp
@ -7,7 +7,7 @@
 #include <QFileDialog>
 #include <QMessageBox>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "Core/MIPS/MIPSDebugInterface.h"
 #include "Core/Debugger/SymbolMap.h"
--- a/SDL/SDLGLGraphicsContext.cpp
+++ b/SDL/SDLGLGraphicsContext.cpp
@ -4,7 +4,7 @@
 #include "Core/ConfigValues.h"
 #include "Core/System.h"
 #include "base/NativeApp.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "gfx_es2/gpu_features.h"
 #include "thin3d/thin3d_create.h"

--- a/SDL/SDLMain.cpp
+++ b/SDL/SDLMain.cpp
@ -20,7 +20,7 @@ SDLJoystick *joystick = NULL;
 #include <thread>
 #include <locale>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "ext/glslang/glslang/Public/ShaderLang.h"
 #include "image/png_load.h"
--- a/SDL/SDLVulkanGraphicsContext.cpp
+++ b/SDL/SDLVulkanGraphicsContext.cpp
@ -1,7 +1,7 @@
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"
 #include "base/NativeApp.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "thin3d/thin3d.h"
 #include "thin3d/thin3d_create.h"
 #include "thin3d/VulkanRenderManager.h"
--- a/UI/ComboKeyMappingScreen.cpp
+++ b/UI/ComboKeyMappingScreen.cpp
@ -15,7 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "gfx_es2/draw_buffer.h"
 #include "gfx/texture_atlas.h"
 #include "ui/ui_context.h"
--- a/UI/ControlMappingScreen.cpp
+++ b/UI/ControlMappingScreen.cpp
@ -19,7 +19,7 @@
 #include <deque>
 #include <mutex>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "gfx/texture_atlas.h"
 #include "ui/root.h"
--- a/UI/DevScreens.cpp
+++ b/UI/DevScreens.cpp
@ -18,7 +18,7 @@
 #include <algorithm>

 #include "ppsspp_config.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "gfx_es2/gpu_features.h"
 #include "Common/Data/Text/I18n.h"
--- a/UI/DisplayLayoutScreen.cpp
+++ b/UI/DisplayLayoutScreen.cpp
@ -18,7 +18,7 @@
 #include <algorithm>
 #include <vector>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "gfx/texture_atlas.h"
 #include "gfx_es2/draw_buffer.h"
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@ -19,7 +19,7 @@

 #include <algorithm>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "Common/Profiler/Profiler.h"

--- a/UI/GPUDriverTestScreen.h
+++ b/UI/GPUDriverTestScreen.h
@ -1,6 +1,6 @@
 #pragma once

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "ui/ui_context.h"
 #include "ui/view.h"
 #include "ui/viewgroup.h"
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@ -19,7 +19,7 @@

 #include <algorithm>

-#include "base/display.h"  // Only to check screen aspect ratio with pixel_yres/pixel_xres
+#include "Common/System/Display.h"  // Only to check screen aspect ratio with pixel_yres/pixel_xres
 #include "base/NativeApp.h"

 #include "Common/Data/Color/RGBAUtil.h"
--- a/UI/GamepadEmu.cpp
+++ b/UI/GamepadEmu.cpp
@ -18,7 +18,7 @@
 #include <algorithm>

 #include "Common/Data/Color/RGBAUtil.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "gfx/texture_atlas.h"
 #include "Common/Math/math_util.h"
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@ -20,7 +20,7 @@

 #include "ppsspp_config.h"

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "gfx/texture_atlas.h"
 #include "gfx_es2/draw_buffer.h"
--- a/UI/MiscScreens.cpp
+++ b/UI/MiscScreens.cpp
@ -21,7 +21,7 @@
 #include <functional>

 #include "base/NativeApp.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "gfx_es2/draw_buffer.h"
 #include "Common/Math/curves.h"
 #include "ui/ui_context.h"
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@ -43,7 +43,7 @@
 #include "Windows/CaptureDevice.h"
 #endif

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "net/http_client.h"
 #include "net/resolve.h"
--- a/UI/ReportScreen.cpp
+++ b/UI/ReportScreen.cpp
@ -17,7 +17,7 @@

 #include <string>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 // TODO: For text align flags, probably shouldn't be in gfx_es2/...
 #include "gfx_es2/draw_buffer.h"
--- a/UWP/CommonUWP/CommonUWP.vcxproj
+++ b/UWP/CommonUWP/CommonUWP.vcxproj
@ -453,6 +453,7 @@
    <ClInclude Include="..\..\Common\StringUtils.h" />
    <ClInclude Include="..\..\Common\Swap.h" />
    <ClInclude Include="..\..\Common\SysError.h" />
+    <ClInclude Include="..\..\Common\System\Display.h" />
    <ClInclude Include="..\..\Common\ThreadPools.h" />
    <ClInclude Include="..\..\Common\ThreadSafeList.h" />
    <ClInclude Include="..\..\Common\Thread\Executor.h" />
@ -529,6 +530,7 @@
    <ClCompile Include="..\..\Common\SysError.cpp" />
    <ClCompile Include="..\..\Common\OSVersion.cpp" />
    <ClCompile Include="..\..\Common\StringUtils.cpp" />
+    <ClCompile Include="..\..\Common\System\Display.cpp" />
    <ClCompile Include="..\..\Common\ThreadPools.cpp" />
    <ClCompile Include="..\..\Common\Thread\Executor.cpp" />
    <ClCompile Include="..\..\Common\Thread\PrioritizedWorkQueue.cpp" />
--- a/UWP/CommonUWP/CommonUWP.vcxproj.filters
+++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters
@ -61,6 +61,9 @@
    <Filter Include="Profiler">
      <UniqueIdentifier>{6673c122-d7ed-4ccc-969a-12d317ee1f93}</UniqueIdentifier>
    </Filter>
+    <Filter Include="System">
+      <UniqueIdentifier>{661f7d9d-5922-48d6-88ea-2f24bb57419f}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\Common\ABI.cpp" />
@ -246,6 +249,9 @@
    <ClCompile Include="..\..\Common\Profiler\Profiler.cpp">
      <Filter>Profiler</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\Common\System\Display.cpp">
+      <Filter>System</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="targetver.h" />
@ -437,6 +443,9 @@
    <ClInclude Include="..\..\Common\Profiler\Profiler.h">
      <Filter>Profiler</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\Common\System\Display.h">
+      <Filter>System</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <Text Include="..\..\ext\libpng17\CMakeLists.txt">
--- a/UWP/PPSSPP_UWPMain.cpp
+++ b/UWP/PPSSPP_UWPMain.cpp
@ -7,7 +7,7 @@
 #include "file/file_util.h"
 #include "net/http_client.h"
 #include "net/resolve.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "thin3d/thin3d_create.h"

 #include "Common/Common.h"
--- a/Windows/Debugger/CtrlDisAsmView.cpp
+++ b/Windows/Debugger/CtrlDisAsmView.cpp
@ -22,7 +22,7 @@
 #include "Common/CommonWindows.h"
 #include "Common/Data/Encoding/Utf8.h"
 #include "ext/xxhash.h"
-#include "base/display.h"
+#include "Common/System/Display.h"

 #include <CommDlg.h>
 #include <tchar.h>
--- a/Windows/Debugger/CtrlMemView.cpp
+++ b/Windows/Debugger/CtrlMemView.cpp
@ -9,7 +9,7 @@
 #include "Windows/W32Util/Misc.h"
 #include "Windows/InputBox.h"
 #include "Windows/main.h"
-#include "base/display.h"
+#include "Common/System/Display.h"

 #include "Debugger_Disasm.h"
 #include "DebuggerShared.h"
--- a/Windows/Debugger/CtrlRegisterList.cpp
+++ b/Windows/Debugger/CtrlRegisterList.cpp
@ -3,7 +3,7 @@
 #include <math.h>
 #include <tchar.h>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Data/Encoding/Utf8.h"
 #include "Windows/resource.h"
 #include "Core/MemMap.h"
--- a/Windows/Debugger/Debugger_MemoryDlg.cpp
+++ b/Windows/Debugger/Debugger_MemoryDlg.cpp
@ -4,7 +4,7 @@
 #include <windowsx.h>
 #include "..\resource.h"

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Data/Encoding/Utf8.h"

 #include "Core/Debugger/SymbolMap.h"
--- a/Windows/GEDebugger/CtrlDisplayListView.cpp
+++ b/Windows/GEDebugger/CtrlDisplayListView.cpp
@ -1,4 +1,4 @@
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Windows/GEDebugger/CtrlDisplayListView.h"
 #include "Windows/GEDebugger/GEDebugger.h"
 #include "Windows/InputBox.h"
--- a/Windows/GPU/D3D11Context.cpp
+++ b/Windows/GPU/D3D11Context.cpp
@ -5,7 +5,7 @@
 #include <WinError.h>

 #include "Common/Log.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Data/Encoding/Utf8.h"
 #include "Common/Data/Text/I18n.h"

--- a/Windows/GPU/D3D9Context.cpp
+++ b/Windows/GPU/D3D9Context.cpp
@ -5,7 +5,7 @@

 #include "gfx/d3d9_state.h"

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Data/Encoding/Utf8.h"
 #include "Common/Data/Text/I18n.h"

--- a/Windows/MainWindow.cpp
+++ b/Windows/MainWindow.cpp
@ -31,7 +31,7 @@
 #include <map>
 #include <string>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "Common/TimeUtil.h"
 #include "Common/StringUtils.h"
--- a/Windows/RawInput.cpp
+++ b/Windows/RawInput.cpp
@ -20,7 +20,7 @@
 #include <vector>

 #include "base/NativeApp.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Input/InputState.h"
 #include "Common/Log.h"
 #include "Windows/RawInput.h"
--- a/Windows/TouchInputHandler.cpp
+++ b/Windows/TouchInputHandler.cpp
@ -4,7 +4,7 @@

 #include <algorithm>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"

 #include "Common/CommonWindows.h"
--- a/Windows/WindowsHost.cpp
+++ b/Windows/WindowsHost.cpp
@ -32,7 +32,7 @@
 #pragma warning(pop)

 // native stuff
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "file/file_util.h"
 #include "Common/Input/InputState.h"
--- a/Windows/main.cpp
+++ b/Windows/main.cpp
@ -31,7 +31,7 @@
 #include <ShlObj.h>
 #include <mmsystem.h>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "Common/File/VFS/VFS.h"
 #include "Common/File/VFS/AssetReader.h"
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@ -102,7 +102,6 @@ ARCH_FILES := \
 endif

 NATIVE_FILES :=\
-  $(SRC)/ext/native/base/display.cpp \
  $(SRC)/ext/native/file/fd_util.cpp \
  $(SRC)/ext/native/file/file_util.cpp \
  $(SRC)/ext/native/net/http_client.cpp \
@ -278,6 +277,7 @@ EXEC_AND_LIB_FILES := \
  $(SRC)/Common/Math/lin/vec3.cpp.arm \
  $(SRC)/Common/Math/lin/matrix4x4.cpp.arm \
  $(SRC)/Common/Profiler/Profiler.cpp \
+  $(SRC)/Common/System/Display.cpp \
  $(SRC)/Common/Thread/Executor.cpp \
  $(SRC)/Common/Thread/PrioritizedWorkQueue.cpp \
  $(SRC)/Common/Thread/ThreadPool.cpp \
--- a/android/jni/AndroidJavaGLContext.cpp
+++ b/android/jni/AndroidJavaGLContext.cpp
@ -1,5 +1,5 @@
 #include "AndroidJavaGLContext.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "gfx_es2/gpu_features.h"
 #include "Common/Log.h"
--- a/android/jni/AndroidVulkanContext.cpp
+++ b/android/jni/AndroidVulkanContext.cpp
@ -1,6 +1,6 @@
 #include "AndroidVulkanContext.h"
 #include "base/NativeApp.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Log.h"
 #include "Common/Vulkan/VulkanContext.h"
 #include "Common/Vulkan/VulkanDebug.h"
--- a/android/jni/TestRunner.cpp
+++ b/android/jni/TestRunner.cpp
@ -26,7 +26,7 @@
 #include <iostream>

 #include "ppsspp_config.h"
-#include "base/display.h"
+#include "Common/System/Display.h"

 #include "Common/FileUtil.h"
 #include "Common/Log.h"
--- a/android/jni/app-android.cpp
+++ b/android/jni/app-android.cpp
@ -49,7 +49,7 @@ struct JNIEnv {};
 #define JNI_VERSION_1_6 16
 #endif

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "Common/Thread/ThreadUtil.h"
 #include "Common/File/VFS/VFS.h"
--- a/ext/native/gfx_es2/draw_buffer.cpp
+++ b/ext/native/gfx_es2/draw_buffer.cpp
@ -3,7 +3,7 @@
 #include <vector>
 #include <stddef.h>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Math/math_util.h"
 #include "gfx/texture_atlas.h"
 #include "gfx/gl_debug_log.h"
--- a/ext/native/gfx_es2/draw_text.cpp
+++ b/ext/native/gfx_es2/draw_text.cpp
@ -1,4 +1,4 @@
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "thin3d/thin3d.h"
 #include "Common/Data/Hash/Hash.h"
 #include "Common/Data/Text/WrapText.h"
--- a/ext/native/gfx_es2/draw_text_android.cpp
+++ b/ext/native/gfx_es2/draw_text_android.cpp
@ -1,4 +1,4 @@
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "thin3d/thin3d.h"
 #include "Common/Data/Hash/Hash.h"
 #include "Common/Data/Text/WrapText.h"
--- a/ext/native/gfx_es2/draw_text_qt.cpp
+++ b/ext/native/gfx_es2/draw_text_qt.cpp
@ -1,4 +1,4 @@
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "thin3d/thin3d.h"
 #include "Common/Data/Hash/Hash.h"
 #include "Common/Data/Text/WrapText.h"
--- a/ext/native/gfx_es2/draw_text_uwp.cpp
+++ b/ext/native/gfx_es2/draw_text_uwp.cpp
@ -1,4 +1,4 @@
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "thin3d/thin3d.h"
 #include "Common/Data/Hash/Hash.h"
 #include "Common/Data/Text/WrapText.h"
--- a/ext/native/gfx_es2/draw_text_win.cpp
+++ b/ext/native/gfx_es2/draw_text_win.cpp
@ -1,4 +1,4 @@
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "thin3d/thin3d.h"
 #include "Common/Data/Hash/Hash.h"
 #include "Common/Data/Text/WrapText.h"
--- a/ext/native/native.vcxproj
+++ b/ext/native/native.vcxproj
@ -360,22 +360,10 @@
    </Lib>
  </ItemDefinitionGroup>
  <ItemGroup>
-    <None Include="..\..\ios\main.mm">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
-    </None>
    <None Include="Android.mk" />
    <None Include="tools\CMakeLists.txt" />
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="..\..\Qt\QtMain.h" />
-    <ClInclude Include="base\display.h" />
    <ClInclude Include="base\NativeApp.h" />
    <ClInclude Include="file\fd_util.h" />
    <ClInclude Include="file\file_util.h" />
@ -424,27 +412,6 @@
    <ClInclude Include="ui\viewgroup.h" />
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="base\display.cpp" />
-    <ClCompile Include="..\..\SDL\SDLMain.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\Qt\QtMain.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="file\fd_util.cpp" />
    <ClCompile Include="file\file_util.cpp" />
    <ClCompile Include="gfx\d3d9_shader.cpp" />
--- a/ext/native/native.vcxproj.filters
+++ b/ext/native/native.vcxproj.filters
@ -5,9 +5,6 @@
    <None Include="tools\CMakeLists.txt">
      <Filter>tools</Filter>
    </None>
-    <None Include="..\..\ios\main.mm">
-      <Filter>base</Filter>
-    </None>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="gfx\gl_debug_log.h">
@ -37,9 +34,6 @@
    <ClInclude Include="base\NativeApp.h">
      <Filter>base</Filter>
    </ClInclude>
-    <ClInclude Include="base\display.h">
-      <Filter>base</Filter>
-    </ClInclude>
    <ClInclude Include="ui\ui.h">
      <Filter>ui</Filter>
    </ClInclude>
@ -127,9 +121,6 @@
    <ClInclude Include="ui\ui_tween.h">
      <Filter>ui</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\Qt\QtMain.h">
-      <Filter>base</Filter>
-    </ClInclude>
    <ClInclude Include="thin3d\GLRenderManager.h">
      <Filter>thin3d</Filter>
    </ClInclude>
@ -180,9 +171,6 @@
    <ClCompile Include="file\file_util.cpp">
      <Filter>file</Filter>
    </ClCompile>
-    <ClCompile Include="base\display.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
    <ClCompile Include="ui\ui.cpp">
      <Filter>ui</Filter>
    </ClCompile>
@ -240,12 +228,6 @@
    <ClCompile Include="net\http_server.cpp">
      <Filter>net</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\SDL\SDLMain.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Qt\QtMain.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
    <ClCompile Include="thin3d\thin3d_vulkan.cpp">
      <Filter>thin3d</Filter>
    </ClCompile>
--- a/ext/native/thin3d/VulkanRenderManager.h
+++ b/ext/native/thin3d/VulkanRenderManager.h
@ -10,7 +10,7 @@
 #include <mutex>
 #include <thread>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Vulkan/VulkanContext.h"
 #include "Common/Data/Convert/SmallDataConvert.h"
 #include "Common/Math/math_util.h"
--- a/ext/native/thin3d/thin3d.cpp
+++ b/ext/native/thin3d/thin3d.cpp
@ -2,7 +2,7 @@
 #include <cstring>
 #include <cstdint>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "thin3d/thin3d.h"
 #include "Common/Log.h"
 #include "Common/ColorConv.h"
--- a/ext/native/thin3d/thin3d_d3d11.cpp
+++ b/ext/native/thin3d/thin3d_d3d11.cpp
@ -6,7 +6,7 @@
 #else
 #include "thin3d/d3d11_loader.h"
 #endif
-#include "base/display.h"
+#include "Common/System/Display.h"

 #include "Common/Data/Convert/SmallDataConvert.h"
 #include "Common/Data/Encoding/Utf8.h"
--- a/ext/native/thin3d/thin3d_vulkan.cpp
+++ b/ext/native/thin3d/thin3d_vulkan.cpp
@ -20,7 +20,7 @@
 #include <string>
 #include <map>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "image/zim_load.h"
 #include "Common/Math/lin/matrix4x4.h"
 #include "Common/Data/Convert/SmallDataConvert.h"
--- a/ext/native/ui/screen.cpp
+++ b/ext/native/ui/screen.cpp
@ -1,4 +1,4 @@
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Input/InputState.h"
 #include "ui/root.h"
 #include "ui/screen.h"
--- a/ext/native/ui/ui_context.cpp
+++ b/ext/native/ui/ui_context.cpp
@ -2,7 +2,7 @@

 #include <algorithm>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "ui/ui.h"
 #include "ui/view.h"
--- a/ext/native/ui/ui_screen.cpp
+++ b/ext/native/ui/ui_screen.cpp
@ -2,7 +2,7 @@
 #include <map>
 #include <sstream>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "Common/Input/InputState.h"
 #include "Common/Input/KeyCodes.h"
 #include "Common/Math/curves.h"
--- a/ios/DisplayManager.mm
+++ b/ios/DisplayManager.mm
@ -8,7 +8,7 @@
 #import "DisplayManager.h"
 #import "ViewController.h"
 #import "AppDelegate.h"
-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "Core/System.h"
 #import <AVFoundation/AVFoundation.h>
--- a/ios/PPSSPPUIApplication.mm
+++ b/ios/PPSSPPUIApplication.mm
@ -12,7 +12,7 @@
 #import <Foundation/NSObjCRuntime.h>
 #import <GLKit/GLKit.h>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "Common/TimeUtil.h"
 #include "file/zip_read.h"
--- a/ios/ViewController.mm
+++ b/ios/ViewController.mm
@ -12,7 +12,7 @@
 #import <GLKit/GLKit.h>
 #include <cassert>

-#include "base/display.h"
+#include "Common/System/Display.h"
 #include "base/NativeApp.h"
 #include "file/zip_read.h"
 #include "net/resolve.h"
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@ -170,6 +170,7 @@ SOURCES_CXX += \
 	$(COMMONDIR)/Thread/ThreadUtil.cpp \
 	$(COMMONDIR)/Thread/ThreadPool.cpp \
 	$(COMMONDIR)/Thread/PrioritizedWorkQueue.cpp \
+	$(COMMONDIR)/System/Display.cpp \
 	$(COMMONDIR)/Input/GestureDetector.cpp \
 	$(COMMONDIR)/Input/InputState.cpp \
 	$(COMMONDIR)/Buffer.cpp \
@ -242,7 +243,6 @@ SOURCES_CXX += \
 	$(GPUDIR)/GLES/ShaderManagerGLES.cpp \
 	$(GPUDIR)/GLES/StateMappingGLES.cpp \
 	$(GPUDIR)/GLES/StencilBufferGLES.cpp \
-	$(EXTDIR)/native/base/display.cpp \
 	$(EXTDIR)/glslang/OGLCompilersDLL/InitializeDll.cpp \
 	$(EXTDIR)/glslang/glslang/GenericCodeGen/CodeGen.cpp \
 	$(EXTDIR)/glslang/glslang/GenericCodeGen/Link.cpp \
--- a/libretro/libretro.cpp
+++ b/libretro/libretro.cpp
@ -3,11 +3,22 @@
 #include <thread>
 #include <atomic>
 #include <vector>
-#include <stdlib.h>
+#include <cstdlib>

+#include "base/NativeApp.h"
+
+#include "Common/Log.h"
+#include "Common/LogManager.h"
+#include "Common/System/Display.h"
 #include "Common/TimeUtil.h"
 #include "Common/FileUtil.h"
 #include "Common/Serialize/Serializer.h"
+#include "Common/ConsoleListener.h"
+#include "Common/Input/InputState.h"
+#include "Common/Thread/ThreadUtil.h"
+#include "Common/File/VFS/VFS.h"
+#include "Common/File/VFS/AssetReader.h"
+
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"
 #include "Core/Core.h"
@ -18,18 +29,11 @@
 #include "Core/Host.h"
 #include "Core/MemMap.h"
 #include "Core/System.h"
-#include "Log.h"
-#include "LogManager.h"
-#include "ConsoleListener.h"
-#include "Common/File/VFS/VFS.h"
-#include "Common/File/VFS/AssetReader.h"
+
 #include "GPU/GPUState.h"
 #include "GPU/GPUInterface.h"
 #include "GPU/Common/FramebufferManagerCommon.h"
 #include "GPU/Common/TextureScalerCommon.h"
-#include "Common/Input/InputState.h"
-#include "base/NativeApp.h"
-#include "Common/Thread/ThreadUtil.h"

 #include "libretro/libretro.h"
 #include "libretro/LibretroGraphicsContext.h"