xcb: print X11 key symbol in debug

[vlc] / modules / video_output / opengl.h

diff --git a/modules/video_output/opengl.h b/modules/video_output/opengl.h
index 5711d17fe2ee14279db6772617af47ef59cf7181..f3e9372275721fd91752c3c9d276cd10b834dcb9 100644 (file)
--- a/modules/video_output/opengl.h
+++ b/modules/video_output/opengl.h
@@ -29,43 +29,60 @@
 #include <vlc_picture_pool.h>
 #include <vlc_opengl.h>
 
+#ifdef __APPLE__
+# include <TargetConditionals.h>
+# if !TARGET_OS_IPHONE
+#  define MACOS_OPENGL
+#  include <OpenGL/gl.h>
+# else
+#  define USE_OPENGL_ES 1
+#  include <OpenGLES/ES1/gl.h>
+#  include <OpenGLES/ES2/gl.h>
+#  include <OpenGLES/ES2/glext.h>
+# 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
 
-#define VLCGL_TEXTURE_COUNT 1
-
 #if !defined (__APPLE__)
 # if USE_OPENGL_ES == 2
 #  include <GLES2/gl2.h>
 # elif USE_OPENGL_ES == 1
 #  include <GLES/gl.h>
 # else
+#  ifdef WIN32
+#   include <GL/glew.h>
+#  endif
 #  include <GL/gl.h>
 # endif
-#else
-# if USE_OPENGL_ES == 2
-#  include <OpenGLES/ES2/gl.h>
-# elif USE_OPENGL_ES == 1
-#  include <OpenGLES/ES1/gl.h>
-# else
-#  define MACOS_OPENGL
-#  include <OpenGL/gl.h>
-#  undef VLCGL_TEXTURE_COUNT
-#  define VLCGL_TEXTURE_COUNT 2
-# endif
 #endif
 
+static inline bool HasExtension(const char *apis, const char *api)
+{
+    size_t apilen = strlen(api);
+    while (apis) {
+        while (*apis == ' ')
+            apis++;
+        if (!strncmp(apis, api, apilen) && memchr(" ", apis[apilen], 2))
+            return true;
+        apis = strchr(apis, ' ');
+    }
+    return false;
+}
+
 typedef struct vout_display_opengl_t vout_display_opengl_t;
 
-vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, vlc_gl_t *gl);
+vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
+                                               const vlc_fourcc_t **subpicture_chromas,
+                                               vlc_gl_t *gl);
 void vout_display_opengl_Delete(vout_display_opengl_t *vgl);
 
-int vout_display_opengl_ResetTextures(vout_display_opengl_t *vgl);
-picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl);
+picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned);
 
 int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
-                                picture_t *picture);
+                                picture_t *picture, subpicture_t *subpicture);
 int vout_display_opengl_Display(vout_display_opengl_t *vgl,
                                 const video_format_t *source);