From f49805c441aa787c8efb281d311d2d54c69ca84f 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,Destroy,ClientWait,Wait,Signal}SyncKHR() 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 | 12 +++++------- src/egl/main/eglapi.c | 10 +++++----- src/egl/main/egldisplay.c | 2 +- src/egl/main/egldriver.h | 14 ++++++-------- src/egl/main/eglsync.c | 2 +- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 2bea859fa19..f652381f48d 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -3331,8 +3331,7 @@ dri2_egl_unref_sync(struct dri2_egl_display *dri2_dpy, } static _EGLSync * -dri2_create_sync(const _EGLDriver *drv, _EGLDisplay *disp, - EGLenum type, const EGLAttrib *attrib_list) +dri2_create_sync(_EGLDisplay *disp, EGLenum type, const EGLAttrib *attrib_list) { _EGLContext *ctx = _eglGetCurrentContext(); struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -3432,7 +3431,7 @@ dri2_create_sync(const _EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_destroy_sync(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync) +dri2_destroy_sync(_EGLDisplay *disp, _EGLSync *sync) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_sync *dri2_sync = dri2_egl_sync(sync); @@ -3497,7 +3496,7 @@ dri2_set_blob_cache_funcs(const _EGLDriver *drv, _EGLDisplay *disp, } static EGLint -dri2_client_wait_sync(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, +dri2_client_wait_sync(_EGLDisplay *disp, _EGLSync *sync, EGLint flags, EGLTime timeout) { _EGLContext *ctx = _eglGetCurrentContext(); @@ -3589,8 +3588,7 @@ dri2_client_wait_sync(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, } static EGLBoolean -dri2_signal_sync(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, - EGLenum mode) +dri2_signal_sync(_EGLDisplay *disp, _EGLSync *sync, EGLenum mode) { struct dri2_egl_sync *dri2_sync = dri2_egl_sync(sync); EGLint ret; @@ -3615,7 +3613,7 @@ dri2_signal_sync(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, } static EGLint -dri2_server_wait_sync(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync) +dri2_server_wait_sync(_EGLDisplay *disp, _EGLSync *sync) { _EGLContext *ctx = _eglGetCurrentContext(); struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index fe8eeca8e8c..284d7e0b4b1 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -1867,7 +1867,7 @@ _eglCreateSync(_EGLDisplay *disp, EGLenum type, const EGLAttrib *attrib_list, RETURN_EGL_ERROR(disp, invalid_type_error, EGL_NO_SYNC_KHR); } - sync = drv->CreateSyncKHR(drv, disp, type, attrib_list); + sync = drv->CreateSyncKHR(disp, type, attrib_list); ret = (sync) ? _eglLinkSync(sync) : EGL_NO_SYNC_KHR; RETURN_EGL_EVAL(disp, ret); @@ -1935,7 +1935,7 @@ _eglDestroySync(_EGLDisplay *disp, _EGLSync *s) disp->Extensions.ANDROID_native_fence_sync); _eglUnlinkSync(s); - ret = drv->DestroySyncKHR(drv, disp, s); + ret = drv->DestroySyncKHR(disp, s); RETURN_EGL_EVAL(disp, ret); } @@ -1982,7 +1982,7 @@ _eglClientWaitSyncCommon(_EGLDisplay *disp, EGLDisplay dpy, if (s->Type == EGL_SYNC_REUSABLE_KHR) _eglUnlockDisplay(dpy); - ret = drv->ClientWaitSyncKHR(drv, disp, s, flags, timeout); + ret = drv->ClientWaitSyncKHR(disp, s, flags, timeout); /* * 'disp' is already unlocked for reusable sync type, @@ -2035,7 +2035,7 @@ _eglWaitSyncCommon(_EGLDisplay *disp, _EGLSync *s, EGLint flags) if (flags != 0) RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE); - ret = drv->WaitSyncKHR(drv, disp, s); + ret = drv->WaitSyncKHR(disp, s); RETURN_EGL_EVAL(disp, ret); } @@ -2076,7 +2076,7 @@ eglSignalSyncKHR(EGLDisplay dpy, EGLSync sync, EGLenum mode) _EGL_CHECK_SYNC(disp, s, EGL_FALSE, drv); assert(disp->Extensions.KHR_reusable_sync); - ret = drv->SignalSyncKHR(drv, disp, s, mode); + ret = drv->SignalSyncKHR(disp, s, mode); RETURN_EGL_EVAL(disp, ret); } diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c index b9b5c785f1e..d882a8f617c 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -334,7 +334,7 @@ _eglReleaseDisplayResources(_EGLDisplay *display) list = list->Next; _eglUnlinkSync(sync); - drv->DestroySyncKHR(drv, display, sync); + drv->DestroySyncKHR(display, sync); } assert(!display->ResourceLists[_EGL_RESOURCE_SYNC]); } diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index c324b3e4494..1c5ef7a4fbd 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -135,15 +135,13 @@ struct _egl_driver const EGLint *attr_list); EGLBoolean (*DestroyImageKHR)(_EGLDisplay *disp, _EGLImage *image); - _EGLSync *(*CreateSyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, EGLenum type, + _EGLSync *(*CreateSyncKHR)(_EGLDisplay *disp, EGLenum type, const EGLAttrib *attrib_list); - EGLBoolean (*DestroySyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLSync *sync); - EGLint (*ClientWaitSyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLSync *sync, EGLint flags, EGLTime timeout); - EGLint (*WaitSyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync); - EGLBoolean (*SignalSyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLSync *sync, EGLenum mode); + EGLBoolean (*DestroySyncKHR)(_EGLDisplay *disp, _EGLSync *sync); + EGLint (*ClientWaitSyncKHR)(_EGLDisplay *disp, _EGLSync *sync, + EGLint flags, EGLTime timeout); + EGLint (*WaitSyncKHR)(_EGLDisplay *disp, _EGLSync *sync); + EGLBoolean (*SignalSyncKHR)(_EGLDisplay *disp, _EGLSync *sync, EGLenum mode); EGLint (*DupNativeFenceFDANDROID)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync); diff --git a/src/egl/main/eglsync.c b/src/egl/main/eglsync.c index d0926fce3bb..4673047571d 100644 --- a/src/egl/main/eglsync.c +++ b/src/egl/main/eglsync.c @@ -134,7 +134,7 @@ _eglGetSyncAttrib(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, sync->Type == EGL_SYNC_CL_EVENT_KHR || sync->Type == EGL_SYNC_REUSABLE_KHR || sync->Type == EGL_SYNC_NATIVE_FENCE_ANDROID)) - drv->ClientWaitSyncKHR(drv, disp, sync, 0, 0); + drv->ClientWaitSyncKHR(disp, sync, 0, 0); *value = sync->SyncStatus; break; -- 2.30.2