Module: Mesa Branch: master Commit: 7563c39641d07a604f22a9d47861121ce80116f9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7563c39641d07a604f22a9d47861121ce80116f9
Author: Emil Velikov <[email protected]> Date: Thu Aug 25 12:02:07 2016 +0100 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 <[email protected]> Reviewed-by: Tomasz Figa <[email protected]> --- src/egl/main/eglcurrent.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/egl/main/eglcurrent.h b/src/egl/main/eglcurrent.h index 1e386ac..3f8a0b2 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 } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
