Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-02 11:43:31 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Henrik Rydgard 2015-12-17 19:38:23 +01:00
parent 38263c9073
commit ebf9bd74c6
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Common/GL/GLInterface/EGL.cpp
View File

@ -38,13 +38,16 @@ void cInterfaceEGL::DetectMode()
// attributes for a visual in RGBA format with at least // attributes for a visual in RGBA format with at least
// 8 bits per color // 8 bits per color
int attribs[] = { int attribs[] = {
EGL_RENDERABLE_TYPE, renderable_type,
EGL_RED_SIZE, 8, EGL_RED_SIZE, 8,
EGL_GREEN_SIZE, 8, EGL_GREEN_SIZE, 8,
EGL_BLUE_SIZE, 8, EGL_BLUE_SIZE, 8,
EGL_ALPHA_SIZE, 8, EGL_ALPHA_SIZE, 8,
EGL_DEPTH_SIZE, 16, EGL_DEPTH_SIZE, 16,
EGL_STENCIL_SIZE, 8, EGL_STENCIL_SIZE, 8,
EGL_RENDERABLE_TYPE, renderable_type, EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
EGL_TRANSPARENT_TYPE, EGL_NONE,
EGL_SAMPLES, 0,
EGL_NONE EGL_NONE
}; };

9
android/jni/app-android.cpp
View File

@ -569,20 +569,20 @@ extern "C" jint JNICALL Java_org_ppsspp_ppsspp_NativeApp_getDesiredBackbufferHei
return desiredBackbufferSizeY; return desiredBackbufferSizeY;
} }
extern "C" void JNICALL Java_org_ppsspp_ppsspp_NativeActivity_runEGLRenderLoop(JNIEnv *env, jobject obj, jobject _surf) { extern "C" bool JNICALL Java_org_ppsspp_ppsspp_NativeActivity_runEGLRenderLoop(JNIEnv *env, jobject obj, jobject _surf) {
ANativeWindow *wnd = ANativeWindow_fromSurface(env, _surf); ANativeWindow *wnd = ANativeWindow_fromSurface(env, _surf);
WLOG("runEGLRenderLoop. display_xres=%d display_yres=%d", display_xres, display_yres); WLOG("runEGLRenderLoop. display_xres=%d display_yres=%d", display_xres, display_yres);
if (wnd == nullptr) { if (wnd == nullptr) {
ELOG("Error: Surface is null."); ELOG("Error: Surface is null.");
return; return false;
} }
cInterfaceBase *gl = HostGL_CreateGLInterface(); cInterfaceBase *gl = HostGL_CreateGLInterface();
if (!gl) { if (!gl) {
ELOG("ERROR: Failed to create GL interface"); ELOG("ERROR: Failed to create GL interface");
return; return false;
} }
ILOG("EGL interface created. Desired backbuffer size: %dx%d", desiredBackbufferSizeX, desiredBackbufferSizeY); ILOG("EGL interface created. Desired backbuffer size: %dx%d", desiredBackbufferSizeX, desiredBackbufferSizeY);
@ -600,7 +600,7 @@ extern "C" void JNICALL Java_org_ppsspp_ppsspp_NativeActivity_runEGLRenderLoop(J
if (!gl->Create(wnd, false, use565)) { if (!gl->Create(wnd, false, use565)) {
ELOG("EGL creation failed"); ELOG("EGL creation failed");
// TODO: What do we do now? // TODO: What do we do now?
return; return false;
} }
gl->MakeCurrent(); gl->MakeCurrent();
@ -671,4 +671,5 @@ extern "C" void JNICALL Java_org_ppsspp_ppsspp_NativeActivity_runEGLRenderLoop(J
ANativeWindow_release(wnd); ANativeWindow_release(wnd);
renderLoopRunning = false; renderLoopRunning = false;
WLOG("Render loop exited;"); WLOG("Render loop exited;");
return true;
} }

11
android/src/org/ppsspp/ppsspp/NativeActivity.java
View File

@ -299,12 +299,15 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback {
Log.i(TAG, "Starting the render loop: " + mSurface); Log.i(TAG, "Starting the render loop: " + mSurface);
// Start emulation using the provided Surface. // Start emulation using the provided Surface.
runEGLRenderLoop(mSurface); if (!runEGLRenderLoop(mSurface)) {
// TODO: Add an alert dialog or something
Log.e(TAG, "Failed to start up OpenGL");
}
Log.i(TAG, "Left the render loop: " + mSurface); Log.i(TAG, "Left the render loop: " + mSurface);
} }
}; };
public native void runEGLRenderLoop(Surface surface); public native boolean runEGLRenderLoop(Surface surface);
// Tells the render loop thread to exit, so we can restart it. // Tells the render loop thread to exit, so we can restart it.
public native void exitEGLRenderLoop(); public native void exitEGLRenderLoop();
@ -335,9 +338,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback {
} }
// OK, config should be initialized, we can query for screen rotation. // OK, config should be initialized, we can query for screen rotation.
if (Build.VERSION.SDK_INT >= 9) {
updateScreenRotation(); updateScreenRotation();
}
// Keep the screen bright - very annoying if it goes dark when tilting away // Keep the screen bright - very annoying if it goes dark when tilting away
Window window = this.getWindow(); Window window = this.getWindow();
@ -457,9 +458,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback {
updateSystemUiVisibility(); updateSystemUiVisibility();
} }
// OK, config should be initialized, we can query for screen rotation. // OK, config should be initialized, we can query for screen rotation.
if (Build.VERSION.SDK_INT >= 9) {
updateScreenRotation(); updateScreenRotation();
}
Log.i(TAG, "onResume"); Log.i(TAG, "onResume");
if (mSurfaceView != null) { if (mSurfaceView != null) {