From bfdc76c133bb9e91049824b7480f862f142e4195 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 29 Sep 2015 18:05:55 -0700 Subject: [PATCH] i965/state_cache: Remove the aux_compare fields They haven't been used since 1bba29ed403e735ba0bf04ed8aa2e571884fcaaf so there's no good reason to keep them around. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_context.h | 7 ------- src/mesa/drivers/dri/i965/brw_state_cache.c | 4 ---- 2 files changed, 11 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 8b790fe..3bae90d 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -869,7 +869,6 @@ struct brw_cache_item { }; -typedef bool (*cache_aux_compare_func)(const void *a, const void *b); typedef void (*cache_aux_free_func)(const void *aux); struct brw_cache { @@ -882,12 +881,6 @@ struct brw_cache { uint32_t next_offset; bool bo_used_by_gpu; - /** - * Optional functions used in determining whether the prog_data for a new - * cache item matches an existing cache item (in case there's relevant data - * outside of the prog_data). If NULL, a plain memcmp is done. - */ - cache_aux_compare_func aux_compare[BRW_MAX_CACHE]; /** Optional functions for freeing other pointers attached to a prog_data. */ cache_aux_free_func aux_free[BRW_MAX_CACHE]; }; diff --git a/src/mesa/drivers/dri/i965/brw_state_cache.c b/src/mesa/drivers/dri/i965/brw_state_cache.c index fbc0419..2fbcd14 100644 --- a/src/mesa/drivers/dri/i965/brw_state_cache.c +++ b/src/mesa/drivers/dri/i965/brw_state_cache.c @@ -350,10 +350,6 @@ brw_init_caches(struct brw_context *brw) if (brw->has_llc) drm_intel_gem_bo_map_unsynchronized(cache->bo); - cache->aux_compare[BRW_CACHE_VS_PROG] = brw_vs_prog_data_compare; - cache->aux_compare[BRW_CACHE_GS_PROG] = brw_gs_prog_data_compare; - cache->aux_compare[BRW_CACHE_FS_PROG] = brw_wm_prog_data_compare; - cache->aux_compare[BRW_CACHE_CS_PROG] = brw_cs_prog_data_compare; cache->aux_free[BRW_CACHE_VS_PROG] = brw_stage_prog_data_free; cache->aux_free[BRW_CACHE_GS_PROG] = brw_stage_prog_data_free; cache->aux_free[BRW_CACHE_FS_PROG] = brw_stage_prog_data_free; -- 2.7.4