drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."

Browse Source 
* commit '650a8860d9732accd938a32f99179cc86f101ef4':
  EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
This commit is contained in:
Jesse Hall
2014-04-21 19:46:01 +00:00
committed by Android Git Automerger
parent 6788110191 650a8860d9
commit 43cea7eadb
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opengl/java/android/opengl/GLSurfaceView.java
View File

@ -882,7 +882,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
protected int[] mConfigSpec; protected int[] mConfigSpec;
private int[] filterConfigSpec(int[] configSpec) { private int[] filterConfigSpec(int[] configSpec) {
if (mEGLContextClientVersion != 2) { if (mEGLContextClientVersion != 2 && mEGLContextClientVersion != 3) {
return configSpec; return configSpec;
} }
/* We know none of the subclasses define EGL_RENDERABLE_TYPE. /* We know none of the subclasses define EGL_RENDERABLE_TYPE.
@ -892,7 +892,11 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
int[] newConfigSpec = new int[len + 2]; int[] newConfigSpec = new int[len + 2];
System.arraycopy(configSpec, 0, newConfigSpec, 0, len-1); System.arraycopy(configSpec, 0, newConfigSpec, 0, len-1);
newConfigSpec[len-1] = EGL10.EGL_RENDERABLE_TYPE; newConfigSpec[len-1] = EGL10.EGL_RENDERABLE_TYPE;
newConfigSpec[len] = 4; /* EGL_OPENGL_ES2_BIT */ if (mEGLContextClientVersion == 2) {
newConfigSpec[len] = EGL14.EGL_OPENGL_ES2_BIT; /* EGL_OPENGL_ES2_BIT */
} else {
newConfigSpec[len] = EGLExt.EGL_OPENGL_ES3_BIT_KHR; /* EGL_OPENGL_ES3_BIT_KHR */
}
newConfigSpec[len+1] = EGL10.EGL_NONE; newConfigSpec[len+1] = EGL10.EGL_NONE;
return newConfigSpec; return newConfigSpec;
} }