Commit b370fad7 authored by Felix Paul Kühne's avatar Felix Paul Kühne

vout/opengl: cleanup the Mac includes

parent 729d3528
...@@ -29,18 +29,24 @@ ...@@ -29,18 +29,24 @@
#include <vlc_picture_pool.h> #include <vlc_picture_pool.h>
#include <vlc_opengl.h> #include <vlc_opengl.h>
// Define USE_OPENGL_ES to the GL ES Version you want to select
#ifndef USE_OPENGL_ES
# define USE_OPENGL_ES 0
#endif
#ifdef __APPLE__ #ifdef __APPLE__
# include "TargetConditionals.h" # include "TargetConditionals.h"
# if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR) # if defined(TARGET_OS_MAC)
# define MACOS_OPENGL
# include <OpenGL/gl.h>
# else
# define USE_OPENGL_ES 1 # define USE_OPENGL_ES 1
# include <OpenGLES/ES1/gl.h>
# include <OpenGLES/ES2/gl.h>
# include <OpenGLES/ES2/glext.h>
# endif # endif
#endif #endif
// Define USE_OPENGL_ES to the GL ES Version you want to select
#ifndef USE_OPENGL_ES
# define USE_OPENGL_ES 0
#endif
#if !defined (__APPLE__) #if !defined (__APPLE__)
# if USE_OPENGL_ES == 2 # if USE_OPENGL_ES == 2
# include <GLES2/gl2.h> # include <GLES2/gl2.h>
...@@ -54,15 +60,6 @@ ...@@ -54,15 +60,6 @@
# endif # endif
# include <GL/gl.h> # include <GL/gl.h>
# endif # endif
#else
# if !USE_OPENGL_ES
# define MACOS_OPENGL
# include <OpenGL/gl.h>
# else
# include <OpenGLES/ES1/gl.h>
# include <OpenGLES/ES2/gl.h>
# include <OpenGLES/ES2/glext.h>
# endif
#endif #endif
static inline bool HasExtension(const char *apis, const char *api) static inline bool HasExtension(const char *apis, const char *api)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment