Mesa (staging/19.1): egl: reset blob cache set/get functions on terminate

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: 1c9c540b2ac7f343a9b2c02f3b6aefb9fa170029
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1c9c540b2ac7f343a9b2c02f3b6aefb9fa170029

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Thu Aug 22 10:49:36 2019 +0300

egl: reset blob cache set/get functions on terminate

Fixes errors seen with eglSetBlobCacheFuncsANDROID on Android when
running dEQP that terminates and reinitializes a display.

Fixes: 6f5b57093b3 "egl: add support for EGL_ANDROID_blob_cache"
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
(cherry picked from commit 3e03a3fc5315b488468b28aa40a7e9416f506520)

---

 src/egl/main/eglapi.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 588c6a5f1eb..85d94e8f6dc 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -674,6 +674,10 @@ eglTerminate(EGLDisplay dpy)
       /* do not reset disp->Driver */
       disp->ClientAPIsString[0] = 0;
       disp->Initialized = EGL_FALSE;
+
+      /* Reset blob cache funcs on terminate. */
+      disp->BlobCacheSet = NULL;
+      disp->BlobCacheGet = NULL;
    }
 
    RETURN_EGL_SUCCESS(disp, EGL_TRUE);