diff --git a/Core/Core.cpp b/Core/Core.cpp
index c93cc683c6..1142b1781a 100644
--- a/Core/Core.cpp
+++ b/Core/Core.cpp
@@ -196,7 +196,7 @@ void UpdateRunLoop() {
}
void KeepScreenAwake() {
-#ifdef _WIN32
+#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
SetThreadExecutionState(ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED);
#endif
}
diff --git a/GPU/GPUState.cpp b/GPU/GPUState.cpp
index ad71b4ce75..38a823174a 100644
--- a/GPU/GPUState.cpp
+++ b/GPU/GPUState.cpp
@@ -17,7 +17,6 @@
#include "GPU/ge_constants.h"
#include "GPU/GPUState.h"
-#include "GPU/GLES/ShaderManagerGLES.h"
#include "Common/ChunkFile.h"
#include "Core/CoreParameter.h"
diff --git a/UI/DisplayLayoutScreen.cpp b/UI/DisplayLayoutScreen.cpp
index 7b9dfc2f7c..4e719533ed 100644
--- a/UI/DisplayLayoutScreen.cpp
+++ b/UI/DisplayLayoutScreen.cpp
@@ -28,7 +28,7 @@
#include "Core/Config.h"
#include "Core/System.h"
#include "DisplayLayoutEditor.h"
-#include "GPU/GLES/FramebufferManagerGLES.h"
+#include "GPU/Common/FramebufferCommon.h"
static const int leftColumnWidth = 200;
static const float orgRatio = 1.764706f;
diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index 2f6b18213e..ce2886cd54 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -49,8 +49,10 @@
#include "Core/System.h"
#include "GPU/GPUState.h"
#include "GPU/GPUInterface.h"
-#include "GPU/GLES/FramebufferManagerGLES.h"
+#include "GPU/Common/FramebufferCommon.h"
+#if !PPSSPP_PLATFORM(UWP)
#include "GPU/Vulkan/DebugVisVulkan.h"
+#endif
#include "Core/HLE/sceCtrl.h"
#include "Core/HLE/sceDisplay.h"
#include "Core/HLE/sceSas.h"
@@ -78,9 +80,6 @@
#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
#include "Windows/MainWindow.h"
#endif
-#if !PPSSPP_PLATFORM(UWP)
-#include "gfx/gl_common.h"
-#endif
#ifndef MOBILE_DEVICE
static AVIDump avi;
@@ -1212,9 +1211,11 @@ void EmuScreen::renderUI() {
DrawFPS(draw2d, ctx->GetBounds());
}
+#if !PPSSPP_PLATFORM(UWP)
if (g_Config.iGPUBackend == (int)GPUBackend::VULKAN && g_Config.bShowAllocatorDebug) {
DrawAllocatorVis(ctx, gpu);
}
+#endif
#ifdef USE_PROFILER
if (g_Config.bShowFrameProfiler && !invalid_) {
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 6b63263d7d..c42427622c 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -54,7 +54,7 @@
#include "Core/Reporting.h"
#include "android/jni/TestRunner.h"
#include "GPU/GPUInterface.h"
-#include "GPU/GLES/FramebufferManagerGLES.h"
+#include "GPU/Common/FramebufferCommon.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 b7d1f40921..838205b571 100644
--- a/UWP/GPU_UWP/GPU_UWP.vcxproj
+++ b/UWP/GPU_UWP/GPU_UWP.vcxproj
@@ -313,6 +313,7 @@
+
@@ -365,6 +366,7 @@
+
diff --git a/UWP/GPU_UWP/GPU_UWP.vcxproj.filters b/UWP/GPU_UWP/GPU_UWP.vcxproj.filters
index fbb4d4939b..641d4feef0 100644
--- a/UWP/GPU_UWP/GPU_UWP.vcxproj.filters
+++ b/UWP/GPU_UWP/GPU_UWP.vcxproj.filters
@@ -160,6 +160,9 @@
Debugger
+
+ Common
+
@@ -295,5 +298,8 @@
Debugger
+
+ Common
+
\ No newline at end of file
diff --git a/UWP/NativeUWP/NativeUWP.vcxproj b/UWP/NativeUWP/NativeUWP.vcxproj
index 9db58ee9a8..599d491e0c 100644
--- a/UWP/NativeUWP/NativeUWP.vcxproj
+++ b/UWP/NativeUWP/NativeUWP.vcxproj
@@ -338,7 +338,6 @@
-
@@ -1170,7 +1169,6 @@
-
diff --git a/UWP/NativeUWP/NativeUWP.vcxproj.filters b/UWP/NativeUWP/NativeUWP.vcxproj.filters
index d0abe95c90..6b58b4d5c1 100644
--- a/UWP/NativeUWP/NativeUWP.vcxproj.filters
+++ b/UWP/NativeUWP/NativeUWP.vcxproj.filters
@@ -451,9 +451,6 @@
data
-
- gfx
-
base
@@ -725,8 +722,5 @@
data
-
- gfx
-
\ No newline at end of file
diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp
index 96d346b819..d2d805cde7 100644
--- a/UWP/PPSSPP_UWPMain.cpp
+++ b/UWP/PPSSPP_UWPMain.cpp
@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "pch.h"
#include "PPSSPP_UWPMain.h"
#include
@@ -108,8 +108,7 @@ PPSSPP_UWPMain::PPSSPP_UWPMain(App ^app, const std::shared_ptrSetAllLogLevels(LogTypes::LDEBUG);
diff --git a/ext/native/base/timeutil.cpp b/ext/native/base/timeutil.cpp
index 6d10fc62f2..f48c87a276 100644
--- a/ext/native/base/timeutil.cpp
+++ b/ext/native/base/timeutil.cpp
@@ -7,8 +7,6 @@
#ifdef _WIN32
#include
#else
-#include "gfx/gl_common.h"
-#include "gfx_es2/gpu_features.h"
#include
#include
#endif
@@ -41,25 +39,6 @@ uint64_t _frequency = 0;
uint64_t _starttime = 0;
double real_time_now() {
-#ifdef __ANDROID__
- if (false && gl_extensions.EGL_NV_system_time) {
- // This is needed to profile using PerfHUD on Tegra
- if (_frequency == 0) {
- _frequency = eglGetSystemTimeFrequencyNV();
- _starttime = eglGetSystemTimeNV();
- }
-
- uint64_t cur = eglGetSystemTimeNV();
- int64_t diff = cur - _starttime;
-
- return (double)diff / (double)_frequency;
- }
-#if 0
- // This clock is really "choppy" on Nexus 9!
- struct timespec time;
- clock_gettime(CLOCK_MONOTONIC_RAW, &time);
- return time.tv_sec + time.tv_nsec / 1.0e9;
-#else
static time_t start;
struct timeval tv;
gettimeofday(&tv, NULL);
@@ -68,18 +47,6 @@ double real_time_now() {
}
tv.tv_sec -= start;
return (double)tv.tv_sec + (double)tv.tv_usec / 1000000.0;
-#endif
-
-#else
- static time_t start;
- struct timeval tv;
- gettimeofday(&tv, NULL);
- if (start == 0) {
- start = tv.tv_sec;
- }
- tv.tv_sec -= start;
- return (double)tv.tv_sec + (double)tv.tv_usec / 1000000.0;
-#endif
}
#endif
diff --git a/ext/native/thin3d/GLQueueRunner.cpp b/ext/native/thin3d/GLQueueRunner.cpp
index 96dfe71302..552ba4b5c4 100644
--- a/ext/native/thin3d/GLQueueRunner.cpp
+++ b/ext/native/thin3d/GLQueueRunner.cpp
@@ -997,7 +997,7 @@ void GLQueueRunner::PerformReadback(const GLRStep &pass) {
const GLuint format = GL_RGBA;
const GLuint type = GL_UNSIGNED_BYTE;
const int srcAlignment = 4;
- int dstAlignment = DataFormatSizeInBytes(pass.readback.dstFormat);
+ int dstAlignment = (int)DataFormatSizeInBytes(pass.readback.dstFormat);
int pixelStride = pass.readback.srcRect.w;
// Apply the correct alignment.