From 9d5162eddf8b1a3b7f1f4b60fe15e41ccf9fbd33 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sun, 22 Apr 2018 16:48:15 +0200 Subject: [PATCH] egl: drop unused _EGLDriver from {Create,Export}DRMImageMESA() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Engestrom Reviewed-by: Marek Olšák Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 9 ++------- src/egl/main/eglapi.c | 4 ++-- src/egl/main/egldriver.h | 9 ++++----- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index cfe5e86f9c9..61c2c14ef60 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -2902,8 +2902,7 @@ dri2_create_image_dma_buf(_EGLDisplay *disp, _EGLContext *ctx, return res; } static _EGLImage * -dri2_create_drm_image_mesa(const _EGLDriver *drv, _EGLDisplay *disp, - const EGLint *attr_list) +dri2_create_drm_image_mesa(_EGLDisplay *disp, const EGLint *attr_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_image *dri2_img; @@ -2911,8 +2910,6 @@ dri2_create_drm_image_mesa(const _EGLDriver *drv, _EGLDisplay *disp, unsigned int dri_use, valid_mask; int format; - (void) drv; - if (!attr_list) { _eglError(EGL_BAD_PARAMETER, __func__); return EGL_NO_IMAGE_KHR; @@ -2974,14 +2971,12 @@ dri2_create_drm_image_mesa(const _EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_export_drm_image_mesa(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, +dri2_export_drm_image_mesa(_EGLDisplay *disp, _EGLImage *img, EGLint *name, EGLint *handle, EGLint *stride) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_image *dri2_img = dri2_egl_image(img); - (void) drv; - if (name && !dri2_dpy->image->queryImage(dri2_img->dri_image, __DRI_IMAGE_ATTRIB_NAME, name)) return _eglError(EGL_BAD_ALLOC, "dri2_export_drm_image_mesa"); diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 4007f8d8b49..4fa85092024 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -2205,7 +2205,7 @@ eglCreateDRMImageMESA(EGLDisplay dpy, const EGLint *attr_list) if (!disp->Extensions.MESA_drm_image) RETURN_EGL_EVAL(disp, EGL_NO_IMAGE_KHR); - img = drv->CreateDRMImageMESA(drv, disp, attr_list); + img = drv->CreateDRMImageMESA(disp, attr_list); ret = (img) ? _eglLinkImage(img) : EGL_NO_IMAGE_KHR; RETURN_EGL_EVAL(disp, ret); @@ -2228,7 +2228,7 @@ eglExportDRMImageMESA(EGLDisplay dpy, EGLImage image, if (!img) RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE); - ret = drv->ExportDRMImageMESA(drv, disp, img, name, handle, stride); + ret = drv->ExportDRMImageMESA(disp, img, name, handle, stride); RETURN_EGL_EVAL(disp, ret); } diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index fff4dbd96b1..2aaee01f68e 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -147,11 +147,10 @@ struct _egl_driver EGLBoolean (*SwapBuffersRegionNOK)(_EGLDisplay *disp, _EGLSurface *surf, EGLint numRects, const EGLint *rects); - _EGLImage *(*CreateDRMImageMESA)(const _EGLDriver *drv, _EGLDisplay *disp, - const EGLint *attr_list); - EGLBoolean (*ExportDRMImageMESA)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLImage *img, EGLint *name, - EGLint *handle, EGLint *stride); + _EGLImage *(*CreateDRMImageMESA)(_EGLDisplay *disp, const EGLint *attr_list); + EGLBoolean (*ExportDRMImageMESA)(_EGLDisplay *disp, _EGLImage *img, + EGLint *name, EGLint *handle, + EGLint *stride); EGLBoolean (*BindWaylandDisplayWL)(const _EGLDriver *drv, _EGLDisplay *disp, struct wl_display *display); -- 2.30.2