From 4efb66fdb63d684684286fcbeaf8e39a47bb6f5a Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Fri, 21 Dec 2012 12:57:43 +0100
Subject: [PATCH] Fix hw transform and audio on android, misc

---
 Core/HLE/sceKernelThread.cpp                      | 4 ++--
 GPU/GLES/VertexDecoder.cpp                        | 2 +-
 GPU/GLES/VertexShaderGenerator.cpp                | 2 +-
 android/jni/NativeApp.cpp                         | 2 +-
 android/src/org/ppsspp/ppsspp/PpssppActivity.java | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp
index cd82d8fa48..6523d8ba3a 100644
--- a/Core/HLE/sceKernelThread.cpp
+++ b/Core/HLE/sceKernelThread.cpp
@@ -1136,10 +1136,10 @@ void sceKernelExitDeleteThread()
   Thread *t = kernelObjects.Get<Thread>(threadHandle, error);
   if (t)
   {
-    ERROR_LOG(HLE,"sceKernelExitDeleteThread()");
+    INFO_LOG(HLE,"sceKernelExitDeleteThread()");
     currentThread->nt.status = THREADSTATUS_DORMANT;
     currentThread->nt.exitStatus = PARAM(0);
-	__KernelFireThreadEnd(currentThread);
+		__KernelFireThreadEnd(currentThread);
 		//userMemory.Free(currentThread->stackBlock);
 		currentThread->stackBlock = 0;
 
diff --git a/GPU/GLES/VertexDecoder.cpp b/GPU/GLES/VertexDecoder.cpp
index dce69038f7..8f7b7fb0b3 100644
--- a/GPU/GLES/VertexDecoder.cpp
+++ b/GPU/GLES/VertexDecoder.cpp
@@ -648,6 +648,7 @@ void VertexDecoder::SetVertexType(u32 fmt) {
 void VertexDecoder::DecodeVerts(u8 *decodedptr, const void *verts, const void *inds, int prim, int count, int *indexLowerBound, int *indexUpperBound) const
 {
 	// Find index bounds. Could cache this in display lists.
+	// Also, this could be greatly sped up with SSE2, although rarely a bottleneck.
 	int lowerBound = 0x7FFFFFFF;
 	int upperBound = 0;
 	if (idx == (GE_VTYPE_IDX_8BIT >> GE_VTYPE_IDX_SHIFT)) {
@@ -685,4 +686,3 @@ void VertexDecoder::DecodeVerts(u8 *decodedptr, const void *verts, const void *i
 		decoded_ += decFmt.stride;
 	}
 }
-
diff --git a/GPU/GLES/VertexShaderGenerator.cpp b/GPU/GLES/VertexShaderGenerator.cpp
index 77276b76d9..395021ce56 100644
--- a/GPU/GLES/VertexShaderGenerator.cpp
+++ b/GPU/GLES/VertexShaderGenerator.cpp
@@ -327,7 +327,7 @@ char *GenerateVertexShader(int prim)
 			if (doLight[i] == LIGHT_DOTONLY)
 				continue;  // Actually, might want specular dot.... TODO
 
-			WRITE(p, "  float lightScale%i = 1.0f;\n", i);
+			WRITE(p, "  float lightScale%i = 1.0;\n", i);
 			if (type != GE_LIGHTTYPE_DIRECTIONAL) {
 				// Attenuation
 				WRITE(p, "  float distance%i = length(toLight%i);\n", i, i);
diff --git a/android/jni/NativeApp.cpp b/android/jni/NativeApp.cpp
index 6f0ae119e7..8f6b959cc4 100644
--- a/android/jni/NativeApp.cpp
+++ b/android/jni/NativeApp.cpp
@@ -133,7 +133,7 @@ void NativeMix(short *audio, int num_samples)
 {
 	if (g_mixer)
 	{
-		g_mixer->Mix(audio, num_samples/2);
+		g_mixer->Mix(audio, num_samples);
 	}
 	else
 	{
diff --git a/android/src/org/ppsspp/ppsspp/PpssppActivity.java b/android/src/org/ppsspp/ppsspp/PpssppActivity.java
index be46ac6038..bd7cd15d12 100644
--- a/android/src/org/ppsspp/ppsspp/PpssppActivity.java
+++ b/android/src/org/ppsspp/ppsspp/PpssppActivity.java
@@ -15,4 +15,4 @@ public class PpssppActivity extends NativeActivity {
 	{   
 		return false;
 	}  
-} 
\ No newline at end of file
+}     
\ No newline at end of file