From 4b97869e5f8159bde598cbfc31f70ea3001d08df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= Date: Mon, 8 Feb 2016 23:06:51 +0200 Subject: Enable building the opengl-cb video renderer on Android * Add Android-specific OpenGL ES feature and checks * Add missing GL_* symbols for Android (list gathered by Ilya Zhuravlev ) --- video/out/opengl/common.h | 2 ++ video/out/opengl/header_fixes.h | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) (limited to 'video') diff --git a/video/out/opengl/common.h b/video/out/opengl/common.h index 9b16f82423..9236ce1d6f 100644 --- a/video/out/opengl/common.h +++ b/video/out/opengl/common.h @@ -36,6 +36,8 @@ #include #include #include +#elif HAVE_ANDROID_GL +#include #else #include #include diff --git a/video/out/opengl/header_fixes.h b/video/out/opengl/header_fixes.h index 8d72adb2c6..885c27700f 100644 --- a/video/out/opengl/header_fixes.h +++ b/video/out/opengl/header_fixes.h @@ -62,6 +62,30 @@ #define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B #endif +#if HAVE_ANDROID_GL +#define GL_UNSIGNED_BYTE_3_3_2 0x8032 +#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 +#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 +#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 +#define GL_RGB_422_APPLE 0x8A1F +#define GL_BGR 0x80E0 +#define GL_BGRA 0x80E1 +#define GL_TEXTURE_1D 0x0DE0 +#define GL_WRITE_ONLY 0x88B9 +#define GL_RGB16 0x8054 +#define GL_RGB10 0x8052 +#define GL_RGBA12 0x805A +#define GL_RGBA16 0x805B +#define GL_TEXTURE_RED_SIZE 0x805C +#define GL_TEXTURE_LUMINANCE_SIZE 0x8060 +#define GL_R16 0x822A +#define GL_RG16 0x822C +#define GL_LUMINANCE16 0x8042 +#define GL_LUMINANCE16_ALPHA16 0x8048 +#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA +#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB +#endif + #undef MP_GET_GL_WORKAROUNDS #endif // MP_GET_GL_WORKAROUNDS -- cgit v1.2.3