Commit 30b05392 authored by Felix Paul Kühne's avatar Felix Paul Kühne

opengl: disable shaders on older iOS releases so we get a picture

parent fc369638
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
# define PFNGLCLIENTACTIVETEXTUREPROC typeof(glClientActiveTexture)* # define PFNGLCLIENTACTIVETEXTUREPROC typeof(glClientActiveTexture)*
#if USE_OPENGL_ES #if USE_OPENGL_ES
# define GL_UNPACK_ROW_LENGTH 0 # define GL_UNPACK_ROW_LENGTH 0
# import <CoreFoundation/CoreFoundation.h>
#endif #endif
#endif #endif
...@@ -239,9 +240,17 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, ...@@ -239,9 +240,17 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
return NULL; return NULL;
} }
#ifndef USE_OPENGL_ES
const unsigned char *ogl_version = glGetString(GL_VERSION); const unsigned char *ogl_version = glGetString(GL_VERSION);
bool supports_shaders = strverscmp((const char *)ogl_version, "2.0") >= 0; bool supports_shaders = strverscmp((const char *)ogl_version, "2.0") >= 0;
#else
bool supports_shaders = false;
#ifdef __APPLE__
if( kCFCoreFoundationVersionNumber >= 786. )
supports_shaders = true;
#endif
#endif
GLint max_texture_units = 0; GLint max_texture_units = 0;
glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &max_texture_units); glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &max_texture_units);
...@@ -498,7 +507,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, ...@@ -498,7 +507,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
if( link_status == GL_FALSE ) if( link_status == GL_FALSE )
{ {
fprintf( stderr, "Unable to use program %d", i ); fprintf( stderr, "Unable to use program %d\n", i );
free( vgl ); free( vgl );
return NULL; return NULL;
} }
......
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