i965: Drop the now unused brw_cache_data() function.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h
index f1f51c8761c4f1c2c223a6fe82642ce17658b0ed..df24a8b7d98bc1fb4883ae3e458dabf29d6ca525 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_state.h
+++ b/src/mesa/drivers/dri/i965/brw_state.h
@@ -124,10 +124,6 @@ void brw_clear_validated_bos(struct brw_context *brw);
 /***********************************************************************
  * brw_state_cache.c
  */
-drm_intel_bo *brw_cache_data(struct brw_cache *cache,
-                      enum brw_cache_id cache_id,
-                      const void *data,
-                      GLuint size);
 
 drm_intel_bo *brw_upload_cache(struct brw_cache *cache,
                               enum brw_cache_id cache_id,

diff --git a/src/mesa/drivers/dri/i965/brw_state_cache.c b/src/mesa/drivers/dri/i965/brw_state_cache.c
index 82a0403b2ddd61f575f159cec8500a4e944b57e8..c29705df03633f9889fa1d4ba7fd803d4458572f 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_state_cache.c
+++ b/src/mesa/drivers/dri/i965/brw_state_cache.c
@@ -294,49 +294,6 @@ brw_upload_cache(struct brw_cache *cache,
                                        NULL);
 }
 
-/**
- * Wrapper around brw_cache_data_sz using the cache_id's canonical key size.
- *
- * If nr_reloc_bufs is nonzero, brw_search_cache()/brw_upload_cache() would be
- * better to use, as the potentially changing offsets in the data-used-as-key
- * will result in excessive cache misses.
- *
- * If aux data is involved, use search/upload instead.
-
- */
-drm_intel_bo *
-brw_cache_data(struct brw_cache *cache,
-              enum brw_cache_id cache_id,
-              const void *data,
-              GLuint data_size)
-{
-   drm_intel_bo *bo;
-   struct brw_cache_item *item, lookup;
-   GLuint hash;
-
-   lookup.cache_id = cache_id;
-   lookup.key = data;
-   lookup.key_size = data_size;
-   lookup.reloc_bufs = NULL;
-   lookup.nr_reloc_bufs = 0;
-   hash = hash_key(&lookup);
-   lookup.hash = hash;
-
-   item = search_cache(cache, hash, &lookup);
-   if (item) {
-      update_cache_last(cache, cache_id, item->bo);
-      drm_intel_bo_reference(item->bo);
-      return item->bo;
-   }
-
-   bo = brw_upload_cache(cache, cache_id,
-                        data, data_size,
-                        NULL, 0,
-                        data, data_size);
-
-   return bo;
-}
-
 enum pool_type {
    DW_SURFACE_STATE,
    DW_GENERAL_STATE