commit a196152434d54bc0c3f056d5e04d8d92d3c4d738
author Alexis Hetu <sugoi@google.com> Wed May 20 12:58:27 2015 -0400
committer Alexis Hétu <sugoi@google.com> Wed May 20 19:56:42 2015 +0000
tree 2a43b0e01c431ac620694b5b77e3d13b9f7e7410
parent e503abfeea294d5e889c29412ef84442b4b998b1

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/3176
Tested-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>

src/OpenGL/libEGL/Display.cpp

diff --git a/src/OpenGL/libEGL/Display.cpp b/src/OpenGL/libEGL/Display.cpp
index 6b7a464..2812d38 100644
--- a/src/OpenGL/libEGL/Display.cpp
+++ b/src/OpenGL/libEGL/Display.cpp
@@ -432,8 +432,11 @@
 			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)
 		{