diff options
| -rw-r--r-- | src/intel/common/gen_debug.h | 7 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_disk_cache.c | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/intel/common/gen_debug.h b/src/intel/common/gen_debug.h index aa9f3cf80d7..72d7ca20a39 100644 --- a/src/intel/common/gen_debug.h +++ b/src/intel/common/gen_debug.h @@ -84,10 +84,13 @@ extern uint64_t INTEL_DEBUG; #define DEBUG_COLOR (1ull << 40) #define DEBUG_REEMIT (1ull << 41) +/* These flags are not compatible with the disk shader cache */ +#define DEBUG_DISK_CACHE_DISABLE_MASK DEBUG_SHADER_TIME + /* These flags may affect program generation */ #define DEBUG_DISK_CACHE_MASK \ - (DEBUG_SHADER_TIME | DEBUG_NO16 | DEBUG_NO_DUAL_OBJECT_GS | DEBUG_NO8 | \ - DEBUG_SPILL_FS | DEBUG_SPILL_VEC4 | DEBUG_NO_COMPACTION | DEBUG_DO32) + (DEBUG_NO16 | DEBUG_NO_DUAL_OBJECT_GS | DEBUG_NO8 | DEBUG_SPILL_FS | \ + DEBUG_SPILL_VEC4 | DEBUG_NO_COMPACTION | DEBUG_DO32) #ifdef HAVE_ANDROID_PLATFORM #define LOG_TAG "INTEL-MESA" diff --git a/src/mesa/drivers/dri/i965/brw_disk_cache.c b/src/mesa/drivers/dri/i965/brw_disk_cache.c index 8f1b064fd61..0797e6eac44 100644 --- a/src/mesa/drivers/dri/i965/brw_disk_cache.c +++ b/src/mesa/drivers/dri/i965/brw_disk_cache.c @@ -377,6 +377,9 @@ void brw_disk_cache_init(struct intel_screen *screen) { #ifdef ENABLE_SHADER_CACHE + if (INTEL_DEBUG & DEBUG_DISK_CACHE_DISABLE_MASK) + return; + /* array length: print length + null char + 1 extra to verify it is unused */ char renderer[11]; MAYBE_UNUSED int len = snprintf(renderer, sizeof(renderer), "i965_%04x", |