From d616cc72a241b2f032a3353260ae25058d216fc8 Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Mon, 28 Oct 2013 14:19:27 +1000
Subject: [PATCH] Add Blackberry statistics overlay option.

---
 Core/HLE/sceDisplay.cpp   | 2 +-
 Core/Reporting.cpp        | 2 +-
 UI/GameSettingsScreen.cpp | 6 +++++-
 native                    | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp
index 8d0b52415d..020fb8d671 100644
--- a/Core/HLE/sceDisplay.cpp
+++ b/Core/HLE/sceDisplay.cpp
@@ -533,7 +533,7 @@ void hleEnterVblank(u64 userdata, int cyclesLate) {
 	// non-buffered rendering. The interaction with frame skipping seems to need
 	// some work.
 	if (gpu->FramebufferDirty()) {
-		if (g_Config.iShowFPSCounter) {
+		if (g_Config.iShowFPSCounter && g_Config.iShowFPSCounter < 4) {
 			CalculateFPS();
 		}
 
diff --git a/Core/Reporting.cpp b/Core/Reporting.cpp
index 19b9ed1fe9..182d7862dc 100644
--- a/Core/Reporting.cpp
+++ b/Core/Reporting.cpp
@@ -209,7 +209,7 @@ namespace Reporting
 		postdata.Add("pixel_height", PSP_CoreParameter().pixelHeight);
 		postdata.Add("ticks", (const uint64_t)CoreTiming::GetTicks());
 
-		if (g_Config.iShowFPSCounter)
+		if (g_Config.iShowFPSCounter && g_Config.iShowFPSCounter < 4)
 		{
 			float vps, fps;
 			__DisplayGetAveragedFPS(&vps, &fps);
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 3a01ae3ff4..47e23a67e7 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -168,7 +168,11 @@ void GameSettingsScreen::CreateViews() {
 		prescale->SetEnabled(false);
 
 	graphicsSettings->Add(new ItemHeader(gs->T("Overlay Information")));
-	static const char *fpsChoices[] = {"None", "Speed", "FPS", "Both"};
+	static const char *fpsChoices[] = {"None", "Speed", "FPS", "Both"
+#ifdef BLACKBERRY
+	                                   , "Statistics"
+#endif
+	                                  };
 	graphicsSettings->Add(new PopupMultiChoice(&g_Config.iShowFPSCounter, gs->T("Show FPS Counter"), fpsChoices, 0, ARRAY_SIZE(fpsChoices), gs, screenManager()));
 	graphicsSettings->Add(new CheckBox(&g_Config.bShowDebugStats, gs->T("Show Debug Statistics")));
 
diff --git a/native b/native
index f0819f14a4..11e62f7f3a 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit f0819f14a4e69f154703ef0093375c387e0b1e95
+Subproject commit 11e62f7f3aac0bbbcd7e8ebb6d7e8bdb1d9e721f