Mesa (master): anv/pipeline_cache: fix incorrect guards for NIR cache

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 4b1e436bc95058e67db668e2874892648db3ba69
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b1e436bc95058e67db668e2874892648db3ba69

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Fri Jan 11 11:41:01 2019 +0100

anv/pipeline_cache: fix incorrect guards for NIR cache

Fixes: f6aa9f718516 'anv/pipeline_cache: Add support for caching NIR'
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

---

 src/intel/vulkan/anv_pipeline_cache.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/intel/vulkan/anv_pipeline_cache.c b/src/intel/vulkan/anv_pipeline_cache.c
index 18f310b06e..f9733c5309 100644
--- a/src/intel/vulkan/anv_pipeline_cache.c
+++ b/src/intel/vulkan/anv_pipeline_cache.c
@@ -239,6 +239,7 @@ anv_pipeline_cache_init(struct anv_pipeline_cache *cache,
                                                  sha1_compare_func);
    } else {
       cache->cache = NULL;
+      cache->nir_cache = NULL;
    }
 }
 
@@ -670,7 +671,7 @@ anv_device_search_for_nir(struct anv_device *device,
                           unsigned char sha1_key[20],
                           void *mem_ctx)
 {
-   if (cache) {
+   if (cache && cache->nir_cache) {
       const struct serialized_nir *snir = NULL;
 
       pthread_mutex_lock(&cache->mutex);
@@ -702,7 +703,7 @@ anv_device_upload_nir(struct anv_device *device,
                       const struct nir_shader *nir,
                       unsigned char sha1_key[20])
 {
-   if (cache) {
+   if (cache && cache->nir_cache) {
       pthread_mutex_lock(&cache->mutex);
       struct hash_entry *entry =
          _mesa_hash_table_search(cache->nir_cache, sha1_key);