Do not allow GLES 3.0 on Android

Prevented the creation of an OpenGL ES 3.0 Context on Android. Bug 21323928 Change-Id: I61a0972f772c8e66b57b267e1d596847063927a8 Reviewed-on: https://swiftshader-review.googlesource.com/3176Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Greg Hartman <ghartman@google.com> Tested-by: Greg Hartman <ghartman@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Do not allow GLES 3.0 on Android
a1961524 · Alexis Hetu · Alexis Hétu · e503abfe · a1961524
Commit a1961524 authored May 20, 2015 by Alexis Hetu Committed by Alexis Hétu May 20, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

Display.cpp src/OpenGL/libEGL/Display.cpp +5 -2

No files found.
--- a/src/OpenGL/libEGL/Display.cpp
+++ b/src/OpenGL/libEGL/Display.cpp
@@ -432,8 +432,11 @@ EGLContext Display::createContext(EGLConfig configHandle, const egl::Context *sh
 			context = libGLES_CM->es1CreateContext(config, shareContext);
 		}
 	}
-	else if((clientVersion == 2 && config->mRenderableType & EGL_OPENGL_ES2_BIT) ||
-	        (clientVersion == 3 && config->mRenderableType & EGL_OPENGL_ES3_BIT))
+	else if((clientVersion == 2 && config->mRenderableType & EGL_OPENGL_ES2_BIT)
+#ifndef __ANDROID__ // Do not allow GLES 3.0 on Android
+	     || (clientVersion == 3 && config->mRenderableType & EGL_OPENGL_ES3_BIT)
+#endif
+	        )
 	{
 		if(libGLESv2)
 		{