From e86c9607fe36c3ef7a3da5977876187f38d61750 Mon Sep 17 00:00:00 2001
From: "Dr. Dystopia" <jonis9898@hotmail.com>
Date: Thu, 28 Jan 2021 09:22:40 -0800
Subject: [PATCH] DolphinAnalytics: Move PerformanceSample to header

Avoid circular dependencies or forward declarations in upcoming commits.
---
 Source/Core/Core/CMakeLists.txt      |  1 +
 Source/Core/Core/DolphinAnalytics.h  |  8 ++------
 Source/Core/Core/PerformanceSample.h | 12 ++++++++++++
 Source/Core/DolphinLib.props         |  1 +
 4 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 Source/Core/Core/PerformanceSample.h

diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index e411239d17..789ded01fd 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -512,6 +512,7 @@ add_library(core
   NetworkCaptureLogger.h
   PatchEngine.cpp
   PatchEngine.h
+  PerformanceSample.h
   PowerPC/BreakPoints.cpp
   PowerPC/BreakPoints.h
   PowerPC/CachedInterpreter/CachedInterpreter_Disassembler.cpp
diff --git a/Source/Core/Core/DolphinAnalytics.h b/Source/Core/Core/DolphinAnalytics.h
index 711168c81d..c62d97e0dd 100644
--- a/Source/Core/Core/DolphinAnalytics.h
+++ b/Source/Core/Core/DolphinAnalytics.h
@@ -13,6 +13,8 @@
 #include "Common/CommonTypes.h"
 #include "Common/Config/Config.h"
 
+#include "Core/PerformanceSample.h"
+
 #if defined(ANDROID)
 #include <functional>
 #endif
@@ -138,12 +140,6 @@ public:
   // Get the base builder for building a report
   const Common::AnalyticsReportBuilder& BaseBuilder() const { return m_base_builder; }
 
-  struct PerformanceSample
-  {
-    double speed_ratio;  // See SystemTimers::GetEstimatedEmulationPerformance().
-    int num_prims;
-    int num_draw_calls;
-  };
   // Reports performance information. This method performs its own throttling / aggregation --
   // calling it does not guarantee when a report will actually be sent.
   //
diff --git a/Source/Core/Core/PerformanceSample.h b/Source/Core/Core/PerformanceSample.h
new file mode 100644
index 0000000000..34e289408a
--- /dev/null
+++ b/Source/Core/Core/PerformanceSample.h
@@ -0,0 +1,12 @@
+// Copyright 2021 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+struct PerformanceSample
+{
+  double speed_ratio;  // See SystemTimers::GetEstimatedEmulationPerformance().
+  int num_prims;
+  int num_draw_calls;
+};
diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props
index 9959caf60c..3083663531 100644
--- a/Source/Core/DolphinLib.props
+++ b/Source/Core/DolphinLib.props
@@ -459,6 +459,7 @@
     <ClInclude Include="Core\NetPlayServer.h" />
     <ClInclude Include="Core\NetworkCaptureLogger.h" />
     <ClInclude Include="Core\PatchEngine.h" />
+    <ClInclude Include="Core\PerformanceSample.h" />
     <ClInclude Include="Core\PowerPC\BreakPoints.h" />
     <ClInclude Include="Core\PowerPC\CachedInterpreter\CachedInterpreter.h" />
     <ClInclude Include="Core\PowerPC\CachedInterpreter\CachedInterpreterBlockCache.h" />