From a71dcd2dc2a058f38f6cce78cfe32f9e7f3ac92c 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 ExportDMABUFImage{,Query}MESA() 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 | 5 ++--- src/egl/main/egldriver.h | 11 +++++------ 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 91ad57794d5..53d89302152 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -3014,8 +3014,7 @@ dri2_can_export_dma_buf_image(_EGLDisplay *disp, _EGLImage *img) } static EGLBoolean -dri2_export_dma_buf_image_query_mesa(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLImage *img, +dri2_export_dma_buf_image_query_mesa(_EGLDisplay *disp, _EGLImage *img, EGLint *fourcc, EGLint *nplanes, EGLuint64KHR *modifiers) { @@ -3023,8 +3022,6 @@ dri2_export_dma_buf_image_query_mesa(const _EGLDriver *drv, _EGLDisplay *disp, struct dri2_egl_image *dri2_img = dri2_egl_image(img); int num_planes; - (void) drv; - if (!dri2_can_export_dma_buf_image(disp, img)) return EGL_FALSE; @@ -3059,15 +3056,13 @@ dri2_export_dma_buf_image_query_mesa(const _EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_export_dma_buf_image_mesa(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, +dri2_export_dma_buf_image_mesa(_EGLDisplay *disp, _EGLImage *img, int *fds, EGLint *strides, EGLint *offsets) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_image *dri2_img = dri2_egl_image(img); EGLint nplanes; - (void) drv; - if (!dri2_can_export_dma_buf_image(disp, img)) return EGL_FALSE; diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 7bf70eb53d6..7c25c744438 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -2385,8 +2385,7 @@ eglExportDMABUFImageQueryMESA(EGLDisplay dpy, EGLImage image, if (!img) RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE); - ret = drv->ExportDMABUFImageQueryMESA(drv, disp, img, fourcc, nplanes, - modifiers); + ret = drv->ExportDMABUFImageQueryMESA(disp, img, fourcc, nplanes, modifiers); RETURN_EGL_EVAL(disp, ret); } @@ -2408,7 +2407,7 @@ eglExportDMABUFImageMESA(EGLDisplay dpy, EGLImage image, if (!img) RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE); - ret = drv->ExportDMABUFImageMESA(drv, disp, img, fds, strides, offsets); + ret = drv->ExportDMABUFImageMESA(disp, img, fds, strides, offsets); RETURN_EGL_EVAL(disp, ret); } diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index 82dde96c257..c0da3869ecd 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -169,13 +169,12 @@ struct _egl_driver EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc); - EGLBoolean (*ExportDMABUFImageQueryMESA)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLImage *img, EGLint *fourcc, - EGLint *nplanes, + EGLBoolean (*ExportDMABUFImageQueryMESA)(_EGLDisplay *disp, _EGLImage *img, + EGLint *fourcc, EGLint *nplanes, EGLuint64KHR *modifiers); - EGLBoolean (*ExportDMABUFImageMESA)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLImage *img, EGLint *fds, - EGLint *strides, EGLint *offsets); + EGLBoolean (*ExportDMABUFImageMESA)(_EGLDisplay *disp, _EGLImage *img, + EGLint *fds, EGLint *strides, + EGLint *offsets); int (*GLInteropQueryDeviceInfo)(_EGLDisplay *disp, _EGLContext *ctx, struct mesa_glinterop_device_info *out); -- 2.30.2