[608/906] add GST_GL_PLATFORM_ANY for choosing any platform

This commit is contained in:
Matthew Waters 2012-11-14 20:39:38 +11:00
parent 0c66b39861
commit e47b04c460
3 changed files with 4 additions and 3 deletions

View file

@ -302,8 +302,7 @@ gst_gl_display_thread_create_context (GstGLDisplay * display)
gst_gl_display_lock (display); gst_gl_display_lock (display);
display->gl_window = display->gl_window =
gst_gl_window_new (GST_GL_RENDERER_API_OPENGL, gst_gl_window_new (GST_GL_RENDERER_API_ANY, display->external_gl_context);
display->external_gl_context);
if (!display->gl_window) { if (!display->gl_window) {
gst_gl_display_set_error (display, "Failed to create gl window"); gst_gl_display_set_error (display, "Failed to create gl window");

View file

@ -26,6 +26,7 @@
#include <gst/video/video.h> #include <gst/video/video.h>
#include "gstglwindow.h" #include "gstglwindow.h"
#include "gstglrenderer.h"
#include "gstglshader.h" #include "gstglshader.h"
#include "gstglupload.h" #include "gstglupload.h"
#include "gstgldownload.h" #include "gstgldownload.h"
@ -261,7 +262,7 @@ gboolean gst_gl_display_gen_shader (GstGLDisplay * display,
const gchar * shader_fragment_source, GstGLShader ** shader); const gchar * shader_fragment_source, GstGLShader ** shader);
void gst_gl_display_del_shader (GstGLDisplay * display, GstGLShader * shader); void gst_gl_display_del_shader (GstGLDisplay * display, GstGLShader * shader);
void gst_gl_display_set_window_id (GstGLDisplay * display, gulong window_id); void gst_gl_display_set_window_id (GstGLDisplay * display, guintptr window_id);
void gst_gl_display_set_client_reshape_callback (GstGLDisplay * display, void gst_gl_display_set_client_reshape_callback (GstGLDisplay * display,
CRCB cb); CRCB cb);
void gst_gl_display_set_client_draw_callback (GstGLDisplay * display, CDCB cb); void gst_gl_display_set_client_draw_callback (GstGLDisplay * display, CDCB cb);

View file

@ -67,6 +67,7 @@ typedef enum {
GST_GL_RENDERER_API_GLES2 = 41, GST_GL_RENDERER_API_GLES2 = 41,
GST_GL_RENDERER_API_GLES3 = 42, GST_GL_RENDERER_API_GLES3 = 42,
GST_GL_RENDERER_API_ANY = 254,
GST_GL_RENDERER_API_LAST = 255 GST_GL_RENDERER_API_LAST = 255
} GstGLRendererAPI; } GstGLRendererAPI;