From: Eric Engestrom <eric@engestrom.ch>
Date: Sun, 22 Apr 2018 14:48:15 +0000 (+0200)
Subject: egl: replace _EGLDriver param with _EGLDisplay->Driver in _eglReleaseDisplayResources()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=485f8f89f9027546df169b7b141d5f4dccb1a85e;p=mesa.git

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

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/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 8c6fd19ab2e..7c8ae43e7c4 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1314,7 +1314,7 @@ static EGLBoolean
 dri2_terminate(const _EGLDriver *drv, _EGLDisplay *disp)
 {
    /* Release all non-current Context/Surfaces. */
-   _eglReleaseDisplayResources(drv, disp);
+   _eglReleaseDisplayResources(disp);
 
    dri2_display_release(disp);
 
diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c
index 6423b3fde12..ac05f6f9fff 100644
--- a/src/egl/main/egldisplay.c
+++ b/src/egl/main/egldisplay.c
@@ -293,9 +293,10 @@ out:
  * Destroy the contexts and surfaces that are linked to the display.
  */
 void
-_eglReleaseDisplayResources(const _EGLDriver *drv, _EGLDisplay *display)
+_eglReleaseDisplayResources(_EGLDisplay *display)
 {
    _EGLResource *list;
+   const _EGLDriver *drv = display->Driver;
 
    list = display->ResourceLists[_EGL_RESOURCE_CONTEXT];
    while (list) {
diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h
index a4f7f42cd43..87415f81296 100644
--- a/src/egl/main/egldisplay.h
+++ b/src/egl/main/egldisplay.h
@@ -207,7 +207,7 @@ _eglFindDisplay(_EGLPlatformType plat, void *plat_dpy, const EGLAttrib *attr);
 
 
 extern void
-_eglReleaseDisplayResources(const _EGLDriver *drv, _EGLDisplay *disp);
+_eglReleaseDisplayResources(_EGLDisplay *disp);
 
 
 extern void