Mesa (master): egl: replace dead vfunc with an error

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: e9286eb60b13d86ad59e1067fafea832347e5d1e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e9286eb60b13d86ad59e1067fafea832347e5d1e

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Sat Jun 22 15:53:36 2019 +0100

egl: replace dead vfunc with an error

st/egl used to support eglCreatePbufferFromClientBuffer, but now that
it's gone, any call to it would segfault.

Let's return a nice error instead.

Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

---

 src/egl/main/eglapi.c | 9 ++-------
 src/egl/main/eglapi.h | 7 -------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 2831761f0ea..cffa756365e 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -1678,18 +1678,13 @@ eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype,
    _EGLDisplay *disp = _eglLockDisplay(dpy);
    _EGLConfig *conf = _eglLookupConfig(config, disp);
    _EGLDriver *drv;
-   _EGLSurface *surf;
-   EGLSurface ret;
 
    _EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_NO_SURFACE);
 
    _EGL_CHECK_CONFIG(disp, conf, EGL_NO_SURFACE, drv);
 
-   surf = drv->API.CreatePbufferFromClientBuffer(drv, disp, buftype, buffer,
-                                                 conf, attrib_list);
-   ret = (surf) ? _eglLinkSurface(surf) : EGL_NO_SURFACE;
-
-   RETURN_EGL_EVAL(disp, ret);
+   /* OpenVG is not supported */
+   RETURN_EGL_ERROR(disp, EGL_BAD_ALLOC, EGL_NO_SURFACE);
 }
 
 
diff --git a/src/egl/main/eglapi.h b/src/egl/main/eglapi.h
index 445e8535b57..968f4b27725 100644
--- a/src/egl/main/eglapi.h
+++ b/src/egl/main/eglapi.h
@@ -108,13 +108,6 @@ struct _egl_api
    /* this function may be called from multiple threads at the same time */
    _EGLProc (*GetProcAddress)(_EGLDriver *drv, const char *procname);
 
-   _EGLSurface *(*CreatePbufferFromClientBuffer)(_EGLDriver *drv,
-                                                 _EGLDisplay *disp,
-                                                 EGLenum buftype,
-                                                 EGLClientBuffer buffer,
-                                                 _EGLConfig *config,
-                                                 const EGLint *attrib_list);
-
    _EGLImage *(*CreateImageKHR)(_EGLDriver *drv, _EGLDisplay *disp,
                                 _EGLContext *ctx, EGLenum target,
                                 EGLClientBuffer buffer,