Removing the EGL_OPENGL_ES3_BIT from Android entirely

Bug 21323928

Change-Id: I51addf7a354d3abac34807d60e8dc5fc67dddd1a
Reviewed-on: https://swiftshader-review.googlesource.com/3623
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/OpenGL/libEGL/Config.cpp

diff --git a/src/OpenGL/libEGL/Config.cpp b/src/OpenGL/libEGL/Config.cpp
index 3fc7cc6..acabdce 100644
--- a/src/OpenGL/libEGL/Config.cpp
+++ b/src/OpenGL/libEGL/Config.cpp
@@ -76,7 +76,11 @@
     mColorBufferType = EGL_RGB_BUFFER;
     mConfigCaveat = isSlowConfig() ? EGL_SLOW_CONFIG : EGL_NONE;
     mConfigID = 0;
-    mConformant = EGL_OPENGL_ES_BIT | EGL_OPENGL_ES2_BIT | EGL_OPENGL_ES3_BIT;
+    mConformant = EGL_OPENGL_ES_BIT | EGL_OPENGL_ES2_BIT
+#ifndef __ANDROID__ // Do not allow GLES 3.0 on Android
+        | EGL_OPENGL_ES3_BIT
+#endif
+        ;
 
 	switch (depthStencilFormat)
 	{
@@ -134,7 +138,11 @@
     mNativeRenderable = EGL_FALSE;
     mNativeVisualID = 0;
     mNativeVisualType = 0;
-    mRenderableType = EGL_OPENGL_ES_BIT | EGL_OPENGL_ES2_BIT | EGL_OPENGL_ES3_BIT;
+    mRenderableType = EGL_OPENGL_ES_BIT | EGL_OPENGL_ES2_BIT
+#ifndef __ANDROID__ // Do not allow GLES 3.0 on Android
+        | EGL_OPENGL_ES3_BIT
+#endif
+        ;
     mSampleBuffers = multiSample ? 1 : 0;
     mSamples = multiSample;
     mSurfaceType = EGL_PBUFFER_BIT | EGL_WINDOW_BIT | EGL_SWAP_BEHAVIOR_PRESERVED_BIT;