# define USE_OPENGL_ES 0
#endif
-#define VLCGL_TEXTURE_COUNT 1
-
-#if USE_OPENGL_ES == 1
-# include <OpenGLES/ES1/gl.h>
-#elif USE_OPENGL_ES == 2
-# include <OpenGLES/ES2/gl.h>
-#elif defined(__APPLE__)
-# define MACOS_OPENGL
-# include <OpenGL/gl.h>
-# undef VLCGL_TEXTURE_COUNT
-# define VLCGL_TEXTURE_COUNT 2
+#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
-# include <GL/gl.h>
+# 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>
+# endif
#endif
-typedef struct {
- vlc_gl_t *gl;
-
- video_format_t fmt;
-
- int tex_pixel_size;
- int tex_width;
- int tex_height;
-
- GLuint texture[VLCGL_TEXTURE_COUNT];
- uint8_t *buffer[VLCGL_TEXTURE_COUNT];
+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;
+}
- picture_pool_t *pool;
-} vout_display_opengl_t;
+typedef struct vout_display_opengl_t vout_display_opengl_t;
-int vout_display_opengl_Init(vout_display_opengl_t *vgl,
- video_format_t *fmt, vlc_gl_t *gl);
-void vout_display_opengl_Clean(vout_display_opengl_t *vgl);
+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);