Skip to content

V
vlc-2-2
Commit eae547f4 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

opengl: fix compilation for OS X

parent af8c1f65
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
modules/video_output/opengl.c
View file @ eae547f4
...@@ -346,10 +346,6 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, ...@@ -346,10 +346,6 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
bool supports_shaders = strverscmp((const char *)ogl_version, "2.0") >= 0; bool supports_shaders = strverscmp((const char *)ogl_version, "2.0") >= 0;
#else #else
bool supports_shaders = false; bool supports_shaders = false;
#ifdef __APPLE__
supports_shaders = true;
#endif
#endif #endif
vgl->CreateShader = (PFNGLCREATESHADERPROC)vlc_gl_GetProcAddress(vgl->gl, "glCreateShader"); vgl->CreateShader = (PFNGLCREATESHADERPROC)vlc_gl_GetProcAddress(vgl->gl, "glCreateShader");
...@@ -387,10 +383,12 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, ...@@ -387,10 +383,12 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &max_texture_units); glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &max_texture_units);
#ifdef __APPLE__ #ifdef __APPLE__
#if USE_OPENGL_ES
/* work-around an iOS 6 bug */ /* work-around an iOS 6 bug */
if (kCFCoreFoundationVersionNumber >= 786.) if (kCFCoreFoundationVersionNumber >= 786.)
max_texture_units = 8; max_texture_units = 8;
supports_shaders = true; supports_shaders = true;
#endif
#endif #endif
/* Initialize with default chroma */ /* Initialize with default chroma */
......
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