vlc | branch: master | Felix Paul Kühne <[email protected]> | Fri Feb 8 18:09:31 2013 +0100| [d705a6f0060dc6f4fc3697398be6a0c90c308746] | committer: Felix Paul Kühne
opengl: use OpenGL ES 2 on iOS and fix a compilation warning > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d705a6f0060dc6f4fc3697398be6a0c90c308746 --- modules/video_output/opengl.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/video_output/opengl.h b/modules/video_output/opengl.h index 2ec5f6a..b9d18ec 100644 --- a/modules/video_output/opengl.h +++ b/modules/video_output/opengl.h @@ -31,21 +31,22 @@ /* Change USE_OPENGL_ES value to set the OpenGL ES version (1, 2) you want to use * A value of 0 will activate normal OpenGL */ -#ifndef USE_OPENGL_ES -# define USE_OPENGL_ES 0 -#endif #ifdef __APPLE__ # include <TargetConditionals.h> # if !TARGET_OS_IPHONE +# define USE_OPENGL_ES 0 # define MACOS_OPENGL # include <OpenGL/gl.h> -# else /* Force ESv1 on iOS */ -# define USE_OPENGL_ES 1 +# else /* Force ESv2 on iOS */ +# define USE_OPENGL_ES 2 # include <OpenGLES/ES1/gl.h> # include <OpenGLES/ES2/gl.h> # include <OpenGLES/ES2/glext.h> # endif #else /* !defined (__APPLE__) */ +# ifndef USE_OPENGL_ES +# define USE_OPENGL_ES 0 +# endif # if USE_OPENGL_ES == 2 # include <GLES2/gl2.h> # elif USE_OPENGL_ES == 1 _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
