vlc | branch: master | Felix Paul Kühne <[email protected]> | Fri Feb 8 21:41:37 2013 +0100| [eae547f48bfe0e3ec339aaac6b6a65d25be371f8] | committer: Felix Paul Kühne
opengl: fix compilation for OS X > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eae547f48bfe0e3ec339aaac6b6a65d25be371f8 --- modules/video_output/opengl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c index ef3821c..33a5a43 100644 --- a/modules/video_output/opengl.c +++ b/modules/video_output/opengl.c @@ -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; #else bool supports_shaders = false; - -#ifdef __APPLE__ - supports_shaders = true; -#endif #endif vgl->CreateShader = (PFNGLCREATESHADERPROC)vlc_gl_GetProcAddress(vgl->gl, "glCreateShader"); @@ -387,11 +383,13 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &max_texture_units); #ifdef __APPLE__ +#if USE_OPENGL_ES /* work-around an iOS 6 bug */ if (kCFCoreFoundationVersionNumber >= 786.) max_texture_units = 8; supports_shaders = true; #endif +#endif /* Initialize with default chroma */ vgl->fmt = *fmt; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
