From: Emil Velikov Date: Mon, 15 May 2017 15:14:15 +0000 (+0100) Subject: egl: error out on eglCreateWaylandBufferFromImageWL X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=701311425ee5f2e7b39bcb5e4ef4fa45c01cf836;p=mesa.git egl: error out on eglCreateWaylandBufferFromImageWL Currently f one does the silly thing by probing the entry point w/o checking the extension they will attempt to use the extension even though it cannot work. That is due our of of an assert which gets removed in release builds. Simply error out if the extension is not enabled. Thus we can apply some cleanups with next commits. Signed-off-by: Emil Velikov Reviewed-by: Eric Engestrom --- diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 9cea2f41fff..431678f8bd6 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -2132,7 +2132,8 @@ eglCreateWaylandBufferFromImageWL(EGLDisplay dpy, EGLImage image) _EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE); _EGL_CHECK_DISPLAY(disp, NULL, drv); - assert(disp->Extensions.WL_create_wayland_buffer_from_image); + if (!disp->Extensions.WL_create_wayland_buffer_from_image) + RETURN_EGL_EVAL(disp, NULL); img = _eglLookupImage(image, disp);