summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIago Toral Quiroga <itoral@igalia.com>2019-01-11 11:41:01 +0100
committerIago Toral Quiroga <itoral@igalia.com>2019-01-11 12:45:18 +0100
commit4b1e436bc95058e67db668e2874892648db3ba69 (patch)
tree74c0226ecab998f8c443d07d3d28c7dd41e79bbb
parentad9832d17b5b42f23081fcfabfe0ea4b1dea00df (diff)
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@intel.com>
-rw-r--r--src/intel/vulkan/anv_pipeline_cache.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/intel/vulkan/anv_pipeline_cache.c b/src/intel/vulkan/anv_pipeline_cache.c
index 18f310b06ee..f9733c53098 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);