From bd284f14689688c423fc097d69af894215778aa0 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 24 Apr 2013 09:48:11 -0400 Subject: [PATCH 1/4] [Android] WINDOW_SERVICE should be accessed statically. (it's a static final variable in the Context class, so... yeah). --- .../src/org/dolphinemu/dolphinemu/DolphinEmulator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java index 95c319b6aa..79d1bd44f2 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java @@ -9,6 +9,7 @@ import java.io.OutputStream; import net.simonvt.menudrawer.MenuDrawer; import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Environment; @@ -135,7 +136,8 @@ public class DolphinEmulator extends Activity if (resultCode == Activity.RESULT_OK) { DisplayMetrics displayMetrics = new DisplayMetrics(); - WindowManager wm = (WindowManager) getApplicationContext().getSystemService(getApplicationContext().WINDOW_SERVICE); // the results will be higher than using the activity context object or the getWindowManager() shortcut + getApplicationContext(); + WindowManager wm = (WindowManager) getApplicationContext().getSystemService(Context.WINDOW_SERVICE); // the results will be higher than using the activity context object or the getWindowManager() shortcut wm.getDefaultDisplay().getMetrics(displayMetrics); screenWidth = displayMetrics.widthPixels; screenHeight = displayMetrics.heightPixels; From 9ee3a30878b5bf0310ab4e483cde03293faf1763 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 24 Apr 2013 09:55:12 -0400 Subject: [PATCH 2/4] Remove something that slipped through the last commit. Don't even know why that was there. --- .../Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java index 79d1bd44f2..db647723ad 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java @@ -136,8 +136,7 @@ public class DolphinEmulator extends Activity if (resultCode == Activity.RESULT_OK) { DisplayMetrics displayMetrics = new DisplayMetrics(); - getApplicationContext(); - WindowManager wm = (WindowManager) getApplicationContext().getSystemService(Context.WINDOW_SERVICE); // the results will be higher than using the activity context object or the getWindowManager() shortcut + WindowManager wm = (WindowManager) getApplicationContext().getSystemService(Context.WINDOW_SERVICE); // the results will be higher than using the activity context object or the getWindowManager() shortcut wm.getDefaultDisplay().getMetrics(displayMetrics); screenWidth = displayMetrics.widthPixels; screenHeight = displayMetrics.heightPixels; From 87331fcef5e472094d902d7aec69ce6cfc7b58f3 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 24 Apr 2013 09:00:07 -0500 Subject: [PATCH 3/4] Change Android project name to dolphin emulator --- Source/Android/.project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Android/.project b/Source/Android/.project index a79d8a1840..b4a12698bf 100644 --- a/Source/Android/.project +++ b/Source/Android/.project @@ -1,6 +1,6 @@ - ppsspp + dolphinemulator From 673d256f4502547e4f30249f2a50a2b28f7220ac Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 24 Apr 2013 16:24:55 +0200 Subject: [PATCH 4/4] glew1.8 debug build fix --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 9ee11a9f85..60b3f38079 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -68,6 +68,10 @@ #include #endif +// glew1.8 doesn't define KHR_debug +#ifndef GL_DEBUG_OUTPUT +#define GL_DEBUG_OUTPUT 0x92E0 +#endif void VideoConfig::UpdateProjectionHack()