diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2014-05-29 17:09:26 +0200 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2014-05-29 17:09:26 +0200 |
| commit | 0a599d6f855e26b4e0dfa067c3420c54564527b0 (patch) | |
| tree | 8bd3b8cd7671a2a1e3425e134da6a236d956c06b | |
| parent | 668c680b89f47da341cf5315de6f89d580ab7504 (diff) | |
glcontext: Try GLX support before EGL supportglcontext
If available, glx has got a better chance of being the Gl platform
we want to use compared to EGL
| -rw-r--r-- | gst-libs/gst/gl/gstglcontext.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gst-libs/gst/gl/gstglcontext.c b/gst-libs/gst/gl/gstglcontext.c index ff172d84d..b53e21087 100644 --- a/gst-libs/gst/gl/gstglcontext.c +++ b/gst-libs/gst/gl/gstglcontext.c @@ -260,6 +260,10 @@ gst_gl_context_new (GstGLDisplay * display) user_choice = g_getenv ("GST_GL_PLATFORM"); GST_INFO ("creating a context, user choice:%s", user_choice); +#if GST_GL_HAVE_PLATFORM_GLX + if (!context && (!user_choice || g_strstr_len (user_choice, 3, "glx"))) + context = GST_GL_CONTEXT (gst_gl_context_glx_new ()); +#endif #if GST_GL_HAVE_PLATFORM_EGL if (!context && (!user_choice || g_strstr_len (user_choice, 7, "egl"))) context = GST_GL_CONTEXT (gst_gl_context_egl_new ()); @@ -268,10 +272,6 @@ gst_gl_context_new (GstGLDisplay * display) if (!context && (!user_choice || g_strstr_len (user_choice, 5, "cgl"))) context = GST_GL_CONTEXT (gst_gl_context_cocoa_new ()); #endif -#if GST_GL_HAVE_PLATFORM_GLX - if (!context && (!user_choice || g_strstr_len (user_choice, 3, "glx"))) - context = GST_GL_CONTEXT (gst_gl_context_glx_new ()); -#endif #if GST_GL_HAVE_PLATFORM_WGL if (!context && (!user_choice || g_strstr_len (user_choice, 3, "wgl"))) { context = GST_GL_CONTEXT (gst_gl_context_wgl_new ()); |