ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into wii-network

This commit is contained in:
Matthew Parlane 2013-04-25 02:35:39 +12:00
parent 00316e182b 673d256f45
commit 3f46f26c49
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/.project
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>ppsspp</name>
<name>dolphinemulator</name>
<comment></comment>
<projects>
</projects>

3
Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
View File

@ -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,7 @@ public class DolphinEmulator<MainActivity> 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
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;

4
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
View File

@ -68,6 +68,10 @@
#include <wx/image.h>
#endif
// glew1.8 doesn't define KHR_debug
#ifndef GL_DEBUG_OUTPUT
#define GL_DEBUG_OUTPUT 0x92E0
#endif
void VideoConfig::UpdateProjectionHack()