From: Emil Velikov <emil.velikov@collabora.com>
Date: Thu, 25 Aug 2016 11:02:07 +0000 (+0100)
Subject: egl: treat EGL_OPENGL_API as invalid on Android
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7563c39641d07a604f22a9d47861121ce80116f9;p=mesa.git

egl: treat EGL_OPENGL_API as invalid on Android

At the moment one can use OpenGL in eglBindAPI() only to clear the
EGL_OPENGL_BIT from RenderableType and Conformant for _each_ config.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
---

diff --git a/src/egl/main/eglcurrent.h b/src/egl/main/eglcurrent.h
index 1e386acdafb..3f8a0b28e38 100644
--- a/src/egl/main/eglcurrent.h
+++ b/src/egl/main/eglcurrent.h
@@ -69,7 +69,13 @@ struct _egl_thread_info
 static inline EGLBoolean
 _eglIsApiValid(EGLenum api)
 {
-   return (api >= _EGL_API_FIRST_API && api <= _EGL_API_LAST_API);
+#ifdef ANDROID
+   /* OpenGL is not a valid/supported API on Android */
+   return api >= _EGL_API_FIRST_API && api <= _EGL_API_LAST_API &&
+          api != EGL_OPENGL_API;
+#else
+   return api >= _EGL_API_FIRST_API && api <= _EGL_API_LAST_API;
+#endif
 }