Commit 54701ceb authored by Matthew Waters's avatar Matthew Waters
Browse files

gl/display/egl: Fix precondition in display_egl_get_from_native

We don't really want type=NONE as input and it was already impossible
for that to occur with the other condtions.

CID #1427144
parent bc3f9b53
...@@ -90,7 +90,8 @@ gst_gl_display_egl_finalize (GObject * object) ...@@ -90,7 +90,8 @@ gst_gl_display_egl_finalize (GObject * object)
* @display: pointer to a display (or 0) * @display: pointer to a display (or 0)
* *
* Attempts to create a new #EGLDisplay from @display. If @type is * Attempts to create a new #EGLDisplay from @display. If @type is
* %GST_GL_DISPLAY_TYPE_ANY, then @display must be 0. * %GST_GL_DISPLAY_TYPE_ANY, then @display must be 0. @type must not be
* %GST_GL_DISPLAY_TYPE_NONE.
* *
* Returns: A #EGLDisplay or %EGL_NO_DISPLAY * Returns: A #EGLDisplay or %EGL_NO_DISPLAY
* *
...@@ -103,19 +104,14 @@ gst_gl_display_egl_get_from_native (GstGLDisplayType type, guintptr display) ...@@ -103,19 +104,14 @@ gst_gl_display_egl_get_from_native (GstGLDisplayType type, guintptr display)
EGLDisplay ret = EGL_NO_DISPLAY; EGLDisplay ret = EGL_NO_DISPLAY;
_gst_eglGetPlatformDisplay_type _gst_eglGetPlatformDisplay; _gst_eglGetPlatformDisplay_type _gst_eglGetPlatformDisplay;
g_return_val_if_fail (type != GST_GL_DISPLAY_TYPE_NONE, EGL_NO_DISPLAY);
g_return_val_if_fail ((type != GST_GL_DISPLAY_TYPE_ANY && display != 0) g_return_val_if_fail ((type != GST_GL_DISPLAY_TYPE_ANY && display != 0)
|| (type == GST_GL_DISPLAY_TYPE_ANY && display == 0), EGL_NO_DISPLAY); || (type == GST_GL_DISPLAY_TYPE_ANY && display == 0), EGL_NO_DISPLAY);
g_return_val_if_fail ((type != GST_GL_DISPLAY_TYPE_NONE
|| (type == GST_GL_DISPLAY_TYPE_NONE
&& display == 0)), EGL_NO_DISPLAY);
/* given an EGLDisplay already */ /* given an EGLDisplay already */
if (type == GST_GL_DISPLAY_TYPE_EGL) if (type == GST_GL_DISPLAY_TYPE_EGL)
return (gpointer) display; return (gpointer) display;
if (type == GST_GL_DISPLAY_TYPE_NONE)
type = GST_GL_DISPLAY_TYPE_ANY;
egl_exts = eglQueryString (EGL_NO_DISPLAY, EGL_EXTENSIONS); egl_exts = eglQueryString (EGL_NO_DISPLAY, EGL_EXTENSIONS);
GST_DEBUG ("egl no display extensions: %s", egl_exts); GST_DEBUG ("egl no display extensions: %s", egl_exts);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment