From: Eric Engestrom <eric@engestrom.ch>
Date: Mon, 3 Aug 2020 15:19:30 +0000 (+0200)
Subject: egl: replace _EGLDriver with _EGLDisplay->Driver in _eglGetSyncAttrib()
X-Git-Tag: upstream/21.0.0~6503
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=372c6c42af1dc7600eadb2712739986b2ba35325;p=platform%2Fupstream%2Fmesa.git

egl: replace _EGLDriver with _EGLDisplay->Driver in _eglGetSyncAttrib()

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>
---

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index c356d7a..011c191 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -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);
 }
diff --git a/src/egl/main/eglsync.c b/src/egl/main/eglsync.c
index 4673047..ccad83b 100644
--- a/src/egl/main/eglsync.c
+++ b/src/egl/main/eglsync.c
@@ -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;
diff --git a/src/egl/main/eglsync.h b/src/egl/main/eglsync.h
index 745d541..4fdf15f 100644
--- a/src/egl/main/eglsync.h
+++ b/src/egl/main/eglsync.h
@@ -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);