sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Check that the EGLDisplay used to select config is the same as the rendering EGLDisplay

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10792 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
sha..RD 2013-09-19 03:07:26 +00:00
parent 25814a8859
commit 05603965fc
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/src/android/com/jme3/system/android/AndroidConfigChooser.java
View File

@ -2,10 +2,9 @@ package com.jme3.system.android;
import android.graphics.PixelFormat; import android.graphics.PixelFormat;
import android.opengl.GLSurfaceView.EGLConfigChooser; import android.opengl.GLSurfaceView.EGLConfigChooser;
import com.jme3.renderer.RendererException;
import com.jme3.renderer.android.RendererUtil; import com.jme3.renderer.android.RendererUtil;
import com.jme3.system.AppSettings; import com.jme3.system.AppSettings;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGL10;
@ -25,6 +24,7 @@ public class AndroidConfigChooser implements EGLConfigChooser {
protected EGLConfig bestConfig = null; protected EGLConfig bestConfig = null;
protected EGLConfig fastestConfig = null; protected EGLConfig fastestConfig = null;
protected EGLConfig choosenConfig = null; protected EGLConfig choosenConfig = null;
protected EGLDisplay configForDisplay = null;
protected AppSettings settings; protected AppSettings settings;
protected int pixelFormat; protected int pixelFormat;
protected boolean verbose = false; protected boolean verbose = false;
@ -106,6 +106,9 @@ public class AndroidConfigChooser implements EGLConfigChooser {
*/ */
@Override @Override
public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) { public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) {
if (configForDisplay != display) {
throw new RendererException("The display used for finding config is not the same as the render display");
}
logger.fine("GLSurfaceView asks for egl config, returning: "); logger.fine("GLSurfaceView asks for egl config, returning: ");
logEGLConfig(choosenConfig, display, egl, Level.FINE); logEGLConfig(choosenConfig, display, egl, Level.FINE);
return choosenConfig; return choosenConfig;
@ -126,6 +129,8 @@ public class AndroidConfigChooser implements EGLConfigChooser {
logger.log(Level.FINE, "JME3 using {0} EGL configuration available here: ", type.name()); logger.log(Level.FINE, "JME3 using {0} EGL configuration available here: ", type.name());
if (choosenConfig != null) { if (choosenConfig != null) {
// Remember the display for which we have the EGLConfig for
configForDisplay = display;
logger.info("JME3 using choosen config: "); logger.info("JME3 using choosen config: ");
logEGLConfig(choosenConfig, display, egl, Level.INFO); logEGLConfig(choosenConfig, display, egl, Level.INFO);
pixelFormat = getPixelFormat(choosenConfig, display, egl); pixelFormat = getPixelFormat(choosenConfig, display, egl);