egl: replace _EGLDriver with _EGLDisplay->Driver in _eglGetSyncAttrib()
authorEric Engestrom <eric@engestrom.ch>
Mon, 3 Aug 2020 15:19:30 +0000 (17:19 +0200)
committerMarge Bot <eric+marge@anholt.net>
Sun, 16 Aug 2020 13:49:18 +0000 (13:49 +0000)
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6241>

src/egl/main/eglapi.c
src/egl/main/eglsync.c
src/egl/main/eglsync.h

index c356d7a0bc71ac8448d0925da5160a5710ea0815..011c191f2b83643f66d3cea8343621db6ddf32c7 100644 (file)
@@ -2093,7 +2093,7 @@ _eglGetSyncAttribCommon(_EGLDisplay *disp, _EGLSync *s, EGLint attribute, EGLAtt
           disp->Extensions.KHR_fence_sync ||
           disp->Extensions.ANDROID_native_fence_sync);
 
-   ret = _eglGetSyncAttrib(drv, disp, s, attribute, value);
+   ret = _eglGetSyncAttrib(disp, s, attribute, value);
 
    RETURN_EGL_EVAL(disp, ret);
 }
index 4673047571da01c5514714722d2b720ca415ad76..ccad83bb2417635e8cc5e22abab7452666d4de06 100644 (file)
@@ -120,7 +120,7 @@ _eglInitSync(_EGLSync *sync, _EGLDisplay *disp, EGLenum type,
 
 
 EGLBoolean
-_eglGetSyncAttrib(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync,
+_eglGetSyncAttrib(_EGLDisplay *disp, _EGLSync *sync,
                   EGLint attribute, EGLAttrib *value)
 {
    switch (attribute) {
@@ -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(disp, sync, 0, 0);
+         disp->Driver->ClientWaitSyncKHR(disp, sync, 0, 0);
 
       *value = sync->SyncStatus;
       break;
index 745d5417f2dc7a6fbc0529ba4972093ae63321e5..4fdf15f231e6d2edda1edc41cd43b27b4c7a673a 100644 (file)
@@ -58,7 +58,7 @@ _eglInitSync(_EGLSync *sync, _EGLDisplay *disp, EGLenum type,
 
 
 extern EGLBoolean
-_eglGetSyncAttrib(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync,
+_eglGetSyncAttrib(_EGLDisplay *disp, _EGLSync *sync,
                   EGLint attribute, EGLAttrib *value);