diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2016-08-25 12:02:07 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-08-30 14:49:24 +0100 |
| commit | 7563c39641d07a604f22a9d47861121ce80116f9 (patch) | |
| tree | be0801c192e84b986f01ca120daa14fd451efcc3 /src/egl/main | |
| parent | a165e5cb7c85d9d0a2d8e218f7d98d48c699d836 (diff) | |
| download | external_mesa3d-7563c39641d07a604f22a9d47861121ce80116f9.zip external_mesa3d-7563c39641d07a604f22a9d47861121ce80116f9.tar.gz external_mesa3d-7563c39641d07a604f22a9d47861121ce80116f9.tar.bz2 | |
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>
Diffstat (limited to 'src/egl/main')
| -rw-r--r-- | src/egl/main/eglcurrent.h | 8 |
1 files changed, 7 insertions, 1 deletions
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 } |