From: Tapani Pälli <tapani.palli@intel.com>
Date: Thu, 22 Aug 2019 07:49:36 +0000 (+0300)
Subject: egl: reset blob cache set/get functions on terminate
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=3e03a3fc5315b488468b28aa40a7e9416f506520

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@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
---

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 7c9d2c92a0f..0cd17cebf03 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -676,6 +676,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);