From 1bbb0c7689bb4d999d4b2330b4edf03d39b1430b 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 QueryDmaBuf{Formats,Modifiers}EXT() 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 | 6 +++--- src/egl/main/eglapi.c | 8 +++----- src/egl/main/egldriver.h | 11 +++++------ 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 53d89302152..a150f46bc86 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -2741,8 +2741,8 @@ dri2_check_dma_buf_format(const _EGLImageAttribs *attrs) } static EGLBoolean -dri2_query_dma_buf_formats(const _EGLDriver *drv, _EGLDisplay *disp, - EGLint max, EGLint *formats, EGLint *count) +dri2_query_dma_buf_formats(_EGLDisplay *disp, EGLint max, + EGLint *formats, EGLint *count) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); if (max < 0 || (max > 0 && formats == NULL)) @@ -2772,7 +2772,7 @@ dri2_query_dma_buf_formats(const _EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_query_dma_buf_modifiers(const _EGLDriver *drv, _EGLDisplay *disp, EGLint format, +dri2_query_dma_buf_modifiers(_EGLDisplay *disp, EGLint format, EGLint max, EGLuint64KHR *modifiers, EGLBoolean *external_only, EGLint *count) { diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 7c25c744438..39e1ca2c7e0 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -2571,8 +2571,7 @@ eglQueryDmaBufFormatsEXT(EGLDisplay dpy, EGLint max_formats, _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv); - ret = drv->QueryDmaBufFormatsEXT(drv, disp, max_formats, formats, - num_formats); + ret = drv->QueryDmaBufFormatsEXT(disp, max_formats, formats, num_formats); RETURN_EGL_EVAL(disp, ret); } @@ -2590,9 +2589,8 @@ eglQueryDmaBufModifiersEXT(EGLDisplay dpy, EGLint format, EGLint max_modifiers, _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv); - ret = drv->QueryDmaBufModifiersEXT(drv, disp, format, max_modifiers, - modifiers, external_only, - num_modifiers); + ret = drv->QueryDmaBufModifiersEXT(disp, format, max_modifiers, modifiers, + external_only, num_modifiers); RETURN_EGL_EVAL(disp, ret); } diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index c0da3869ecd..933dd742274 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -182,14 +182,13 @@ struct _egl_driver struct mesa_glinterop_export_in *in, struct mesa_glinterop_export_out *out); - EGLBoolean (*QueryDmaBufFormatsEXT)(const _EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*QueryDmaBufFormatsEXT)(_EGLDisplay *disp, EGLint max_formats, EGLint *formats, EGLint *num_formats); - EGLBoolean (*QueryDmaBufModifiersEXT) (const _EGLDriver *drv, _EGLDisplay *disp, - EGLint format, EGLint max_modifiers, - EGLuint64KHR *modifiers, - EGLBoolean *external_only, - EGLint *num_modifiers); + EGLBoolean (*QueryDmaBufModifiersEXT)(_EGLDisplay *disp, EGLint format, + EGLint max_modifiers, EGLuint64KHR *modifiers, + EGLBoolean *external_only, + EGLint *num_modifiers); void (*SetBlobCacheFuncsANDROID) (const _EGLDriver *drv, _EGLDisplay *disp, EGLSetBlobFuncANDROID set, -- 2.30.2