From 7bb1914fd34123dd2bbdc90f4f78dd0f367aac8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 7 Aug 2023 22:10:38 +0200 Subject: [PATCH] Add FrameTiming.cpp/h (with no real contents) --- Core/Core.vcxproj | 2 ++ Core/Core.vcxproj.filters | 6 ++++++ Core/CoreParameter.h | 1 + Core/FrameTiming.cpp | 12 ++++++++++++ Core/FrameTiming.h | 7 +++++++ Core/HLE/sceDisplay.cpp | 1 + UI/NativeApp.cpp | 1 + UWP/CoreUWP/CoreUWP.vcxproj | 2 ++ UWP/CoreUWP/CoreUWP.vcxproj.filters | 2 ++ android/jni/Android.mk | 1 + libretro/Makefile.common | 1 + 11 files changed, 36 insertions(+) create mode 100644 Core/FrameTiming.cpp create mode 100644 Core/FrameTiming.h diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 9a83c34f78..b179805790 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -565,6 +565,7 @@ + @@ -1151,6 +1152,7 @@ + diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters index 9378881742..627456ae70 100644 --- a/Core/Core.vcxproj.filters +++ b/Core/Core.vcxproj.filters @@ -1243,6 +1243,9 @@ MIPS\IR + + Core + @@ -2004,6 +2007,9 @@ MIPS\IR + + Core + diff --git a/Core/CoreParameter.h b/Core/CoreParameter.h index afa15412a9..3ca526b46a 100644 --- a/Core/CoreParameter.h +++ b/Core/CoreParameter.h @@ -19,6 +19,7 @@ #include +#include "Common/File/Path.h" #include "Core/Compatibility.h" enum GPUCore { diff --git a/Core/FrameTiming.cpp b/Core/FrameTiming.cpp new file mode 100644 index 0000000000..49767bc520 --- /dev/null +++ b/Core/FrameTiming.cpp @@ -0,0 +1,12 @@ +#include "Common/Profiler/Profiler.h" +#include "Common/Log.h" +#include "Common/TimeUtil.h" + +#include "Core/RetroAchievements.h" +#include "Core/CoreParameter.h" +#include "Core/Core.h" +#include "Core/Config.h" +#include "Core/HW/Display.h" +#include "Core/FrameTiming.h" + +FrameTiming g_frameTiming; diff --git a/Core/FrameTiming.h b/Core/FrameTiming.h new file mode 100644 index 0000000000..11bd130678 --- /dev/null +++ b/Core/FrameTiming.h @@ -0,0 +1,7 @@ +#pragma once + +struct FrameTiming { + +}; + +extern FrameTiming g_frameTiming; diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index 5d907d475c..c531c5e5c5 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -38,6 +38,7 @@ #include "Core/Config.h" #include "Core/CoreTiming.h" #include "Core/CoreParameter.h" +#include "Core/FrameTiming.h" #include "Core/Reporting.h" #include "Core/Core.h" #include "Core/System.h" diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 7c7c89db98..6b4599b631 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -90,6 +90,7 @@ #include "Core/ConfigValues.h" #include "Core/Core.h" #include "Core/FileLoaders/DiskCachingFileLoader.h" +#include "Core/FrameTiming.h" #include "Core/KeyMap.h" #include "Core/Reporting.h" #include "Core/RetroAchievements.h" diff --git a/UWP/CoreUWP/CoreUWP.vcxproj b/UWP/CoreUWP/CoreUWP.vcxproj index 38e408470a..8c83c0410e 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj +++ b/UWP/CoreUWP/CoreUWP.vcxproj @@ -196,6 +196,7 @@ + @@ -439,6 +440,7 @@ + diff --git a/UWP/CoreUWP/CoreUWP.vcxproj.filters b/UWP/CoreUWP/CoreUWP.vcxproj.filters index acfd6e128b..3d49ff54fc 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj.filters +++ b/UWP/CoreUWP/CoreUWP.vcxproj.filters @@ -1137,6 +1137,7 @@ + @@ -1800,6 +1801,7 @@ + diff --git a/android/jni/Android.mk b/android/jni/Android.mk index e7a0d9e67d..ef5383e3ba 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -479,6 +479,7 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Core/ConfigSettings.cpp \ $(SRC)/Core/CoreTiming.cpp \ $(SRC)/Core/CwCheat.cpp \ + $(SRC)/Core/FrameTiming.cpp \ $(SRC)/Core/HDRemaster.cpp \ $(SRC)/Core/Instance.cpp \ $(SRC)/Core/KeyMap.cpp \ diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 6f40aa7fbd..373af9fe31 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -667,6 +667,7 @@ SOURCES_CXX += \ $(COREDIR)/HW/SasReverb.cpp \ $(COREDIR)/HW/StereoResampler.cpp \ $(COREDIR)/Compatibility.cpp \ + $(COREDIR)/FrameTiming.cpp \ $(COREDIR)/Loaders.cpp \ $(COREDIR)/MIPS/JitCommon/JitCommon.cpp \ $(COREDIR)/MIPS/JitCommon/JitState.cpp \