From 4d88e9977e05847136f28b800ae00967b2c913b3 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Wed, 14 Nov 2012 20:39:38 +1100 Subject: [PATCH] [608/906] add GST_GL_PLATFORM_ANY for choosing any platform --- gst-libs/gst/gl/gstgldisplay.c | 3 +-- gst-libs/gst/gl/gstgldisplay.h | 3 ++- gst-libs/gst/gl/gstglrenderer.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c index a13f5dd..afd4a50 100644 --- a/gst-libs/gst/gl/gstgldisplay.c +++ b/gst-libs/gst/gl/gstgldisplay.c @@ -302,8 +302,7 @@ gst_gl_display_thread_create_context (GstGLDisplay * display) gst_gl_display_lock (display); display->gl_window = - gst_gl_window_new (GST_GL_RENDERER_API_OPENGL, - display->external_gl_context); + gst_gl_window_new (GST_GL_RENDERER_API_ANY, display->external_gl_context); if (!display->gl_window) { gst_gl_display_set_error (display, "Failed to create gl window"); diff --git a/gst-libs/gst/gl/gstgldisplay.h b/gst-libs/gst/gl/gstgldisplay.h index 0605b3a..54b4d5b 100644 --- a/gst-libs/gst/gl/gstgldisplay.h +++ b/gst-libs/gst/gl/gstgldisplay.h @@ -26,6 +26,7 @@ #include #include "gstglwindow.h" +#include "gstglrenderer.h" #include "gstglshader.h" #include "gstglupload.h" #include "gstgldownload.h" @@ -261,7 +262,7 @@ gboolean gst_gl_display_gen_shader (GstGLDisplay * display, const gchar * shader_fragment_source, 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, CRCB cb); void gst_gl_display_set_client_draw_callback (GstGLDisplay * display, CDCB cb); diff --git a/gst-libs/gst/gl/gstglrenderer.h b/gst-libs/gst/gl/gstglrenderer.h index 9e91ccd..b6129c1 100644 --- a/gst-libs/gst/gl/gstglrenderer.h +++ b/gst-libs/gst/gl/gstglrenderer.h @@ -67,6 +67,7 @@ typedef enum { GST_GL_RENDERER_API_GLES2 = 41, GST_GL_RENDERER_API_GLES3 = 42, + GST_GL_RENDERER_API_ANY = 254, GST_GL_RENDERER_API_LAST = 255 } GstGLRendererAPI; -- 2.7.4