From f8058e4bae8393336499623813b52bd96cd81017 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Mon, 18 Feb 2013 23:22:41 +0100
Subject: [PATCH] Disable warning for bad prefix as it floods in Wipeout Pulse.
 Cleanups.

---
 Core/MIPS/MIPSIntVFPU.cpp           | 2 +-
 GPU/GLES/DisplayListInterpreter.cpp | 4 ++--
 android/jni/EmuScreen.cpp           | 2 +-
 native                              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Core/MIPS/MIPSIntVFPU.cpp b/Core/MIPS/MIPSIntVFPU.cpp
index f823a70a2a53..90b3fbface6e 100644
--- a/Core/MIPS/MIPSIntVFPU.cpp
+++ b/Core/MIPS/MIPSIntVFPU.cpp
@@ -1185,7 +1185,7 @@ namespace MIPSInt
 		float scale = V(vt);
 		if (currentMIPS->vfpuCtrl[VFPU_CTRL_TPREFIX] != 0xE4)
 		{
-			WARN_LOG(CPU, "Broken T prefix used with VScl: %08x / %08x", currentMIPS->vfpuCtrl[VFPU_CTRL_TPREFIX], op);
+			// WARN_LOG(CPU, "Broken T prefix used with VScl: %08x / %08x", currentMIPS->vfpuCtrl[VFPU_CTRL_TPREFIX], op);
 			ApplySwizzleT(&scale, V_Single);
 		}
 		int n = GetNumVectorElements(sz);
diff --git a/GPU/GLES/DisplayListInterpreter.cpp b/GPU/GLES/DisplayListInterpreter.cpp
index e9f1bb78540a..6bf4220d86dd 100644
--- a/GPU/GLES/DisplayListInterpreter.cpp
+++ b/GPU/GLES/DisplayListInterpreter.cpp
@@ -38,7 +38,7 @@
 extern u32 curTextureWidth;
 extern u32 curTextureHeight;
 
-static const int flushOnChangedBeforeCommandList[] = {
+static const u8 flushOnChangedBeforeCommandList[] = {
 	GE_CMD_VERTEXTYPE,
 	GE_CMD_BLENDMODE,
 	GE_CMD_BLENDFIXEDA,
@@ -137,7 +137,7 @@ static const int flushOnChangedBeforeCommandList[] = {
 	GE_CMD_ZBUFWIDTH,
 };
 
-static const int flushBeforeCommandList[] = {
+static const u8 flushBeforeCommandList[] = {
 	GE_CMD_BEZIER,
 	GE_CMD_SPLINE,
 	GE_CMD_SIGNAL,
diff --git a/android/jni/EmuScreen.cpp b/android/jni/EmuScreen.cpp
index b3eb28e4fbb6..8a0d13f84ebd 100644
--- a/android/jni/EmuScreen.cpp
+++ b/android/jni/EmuScreen.cpp
@@ -156,7 +156,7 @@ void EmuScreen::render()
 
 	// We just run the CPU until we get to vblank. This will quickly sync up pretty nicely.
 	// The actual number of cycles doesn't matter so much here as we will break due to CORE_NEXTFRAME, most of the time hopefully...
-	int blockTicks = usToCycles(1000000 / 2);
+	int blockTicks = usToCycles(1000000 / 10);
 
 	// Run until CORE_NEXTFRAME
 	while (coreState == CORE_RUNNING) {
diff --git a/native b/native
index f7db8ff0bea9..f5e7bd5a9c3e 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit f7db8ff0bea971ed6c1332ce746101d3f0146010
+Subproject commit f5e7bd5a9c3e4b39a4eac71b577f06ad54f2bc96