Merge branch 'master' into stable

1 files changed, 13 insertions, 0 deletions

diff --git a/Source/Core/VideoCommon/PerfQueryBase.cpp b/Source/Core/VideoCommon/PerfQueryBase.cpp
new file mode 100644
index 0000000000..76bec0ef46
--- /dev/null
+++ b/Source/Core/VideoCommon/PerfQueryBase.cpp
@@ -0,0 +1,13 @@
+// Copyright 2012 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoCommon/PerfQueryBase.h"
+#include "VideoCommon/VideoConfig.h"
+
+PerfQueryBase* g_perf_query = nullptr;
+
+bool PerfQueryBase::ShouldEmulate()
+{
+	return g_ActiveConfig.bPerfQueriesEnable;
+}