mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-10 16:45:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

glcontext/egl: don't overwrite set GError

Browse source 
Doing so is an error and will cause a glib warning to be printed.

https://bugzilla.gnome.org/show_bug.cgi?id=776722
This commit is contained in:
Matthew Waters 2017-01-10 01:00:12 +11:00 committed by Tim-Philipp Müller
parent 329b4691f8
commit cec46fc75e
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst-libs/gst/gl/egl/gstglcontext_egl.c
View file

@ -439,9 +439,13 @@ gst_gl_context_egl_create_context (GstGLContext * context,
for (i = 0; i < G_N_ELEMENTS (gles2_versions); i++) { for (i = 0; i < G_N_ELEMENTS (gles2_versions); i++) {
gint profileMask = 0; gint profileMask = 0;
gint contextFlags = 0; gint contextFlags = 0;
guint maj = gles2_versions[i].major;
guint min = gles2_versions[i].minor;
if (!gst_gl_context_egl_choose_config (egl, GST_GL_API_GLES2, if (!gst_gl_context_egl_choose_config (egl, GST_GL_API_GLES2, maj, error)) {
gles2_versions[i].major, error)) { GST_DEBUG_OBJECT (context, "Failed to choose a GLES%d config: %s",
maj, error && *error ? (*error)->message : "Unknown");
g_clear_error (error);
continue; continue;
} }
#if defined(EGL_KHR_create_context) #if defined(EGL_KHR_create_context)
@ -450,8 +454,7 @@ gst_gl_context_egl_create_context (GstGLContext * context,
egl->egl_context = egl->egl_context =
_create_context_with_flags (egl, (EGLContext) external_gl_context, _create_context_with_flags (egl, (EGLContext) external_gl_context,
GST_GL_API_GLES2, gles2_versions[i].major, GST_GL_API_GLES2, maj, min, contextFlags, profileMask);
gles2_versions[i].minor, contextFlags, profileMask);
if (egl->egl_context) if (egl->egl_context)
break; break;
@ -462,8 +465,7 @@ gst_gl_context_egl_create_context (GstGLContext * context,
egl->egl_context = egl->egl_context =
_create_context_with_flags (egl, (EGLContext) external_gl_context, _create_context_with_flags (egl, (EGLContext) external_gl_context,
GST_GL_API_GLES2, gles2_versions[i].major, GST_GL_API_GLES2, maj, min, contextFlags, profileMask);
gles2_versions[i].minor, contextFlags, profileMask);
if (egl->egl_context) if (egl->egl_context)
break; break;