RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 08:12:17 +00:00
Code Issues Releases Wiki Activity

build: replace android-gl check with a standard GLES3 check

Browse Source 
There's no reason to make it Android specific, as it uses standard
include paths.
This commit is contained in:
wm4 2017-04-06 08:35:47 +02:00
parent 451e1f0db3
commit 755ce9dac5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
video/out/opengl/common.h
View File

@ -39,7 +39,7 @@
#elif HAVE_IOS_GL
#include <OpenGLES/ES2/glext.h>
#include <OpenGLES/ES3/glext.h>
#elif HAVE_ANDROID_GL
#elif HAVE_STANDARD_GLES3
#include <GLES3/gl3.h>
#else
#include <GL/gl.h>

2
video/out/opengl/header_fixes.h
View File

@ -67,7 +67,7 @@
#define GL_BACK_LEFT 0x0402
#endif
#if HAVE_ANDROID_GL
#if HAVE_STANDARD_GLES3
#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

8
wscript
View File

@ -752,9 +752,9 @@ video_output_features = [
check_statement('GL/gl.h', '(void)GL_LUMINANCE16') # arbitrary OpenGL legacy-only symbol
),
} , {
'name': '--android-gl',
'desc': 'Android OpenGL ES support',
'deps': ['android'],
'name': '--standard-gles3',
'desc': 'Standard OpenGL ES 3.0 support',
'deps_neg': [ 'standard-gl' ],
'func': check_statement('GLES3/gl3.h', '(void)GL_RGB32F'), # arbitrary OpenGL ES 3.0 symbol
} , {
'name': '--ios-gl',
@ -763,7 +763,7 @@ video_output_features = [
} , {
'name': '--any-gl',
'desc': 'Any OpenGL (ES) support',
'deps_any': ['standard-gl', 'android-gl', 'ios-gl', 'cocoa'],
'deps_any': ['standard-gl', 'standard-gles3', 'ios-gl', 'cocoa'],
'func': check_true
} , {
'name': '--plain-gl',