[Mesa-dev] [PATCH 1/3] Revert "disk cache: add callback functionality"

[Timothy Arceri]

This reverts commit ae00ef270233d7ba44e1a751333db16338b816f2.
---
 src/util/disk_cache.c | 48 ------------------------------------------------
 src/util/disk_cache.h | 19 -------------------
 2 files changed, 67 deletions(-)

diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
index ea6808aaf8..dec5a67a79 100644
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
@@ -101,9 +101,6 @@ struct disk_cache {
    /* Driver cache keys. */
    uint8_t *driver_keys_blob;
    size_t driver_keys_blob_size;
-
-   disk_cache_put_cb blob_put_cb;
-   disk_cache_get_cb blob_get_cb;
 };
 
 struct disk_cache_put_job {
@@ -1015,11 +1012,6 @@ disk_cache_put(struct disk_cache *cache, const cache_key key,
                const void *data, size_t size,
                struct cache_item_metadata *cache_item_metadata)
 {
-   if (cache->blob_put_cb) {
-      cache->blob_put_cb(key, CACHE_KEY_SIZE, data, size);
-      return;
-   }
-
    /* Initialize path if not initialized yet. */
    if (cache->path_init_failed ||
        (!cache->path && !disk_cache_path_init(cache)))
@@ -1087,28 +1079,6 @@ disk_cache_get(struct disk_cache *cache, const cache_key key, size_t *size)
    if (size)
       *size = 0;
 
-   if (cache->blob_get_cb) {
-      /* This is what Android EGL defines as the maxValueSize in egl_cache_t
-       * class implementation.
-       */
-      const signed long max_blob_size = 64 * 1024;
-      void *blob = malloc(max_blob_size);
-      if (!blob)
-         return NULL;
-
-      signed long bytes =
-         cache->blob_get_cb(key, CACHE_KEY_SIZE, blob, max_blob_size);
-
-      if (!bytes) {
-         free(blob);
-         return NULL;
-      }
-
-      if (size)
-         *size = bytes;
-      return blob;
-   }
-
    filename = get_cache_file(cache, key);
    if (filename == NULL)
       goto fail;
@@ -1224,11 +1194,6 @@ disk_cache_put_key(struct disk_cache *cache, const cache_key key)
    int i = CPU_TO_LE32(*key_chunk) & CACHE_INDEX_KEY_MASK;
    unsigned char *entry;
 
-   if (cache->blob_put_cb) {
-      cache->blob_put_cb(key, CACHE_KEY_SIZE, key_chunk, sizeof(uint32_t));
-      return;
-   }
-
    if (!cache->path) {
       assert(!"disk_cache_put_key called with no path set");
       return;
@@ -1253,11 +1218,6 @@ disk_cache_has_key(struct disk_cache *cache, const cache_key key)
    int i = CPU_TO_LE32(*key_chunk) & CACHE_INDEX_KEY_MASK;
    unsigned char *entry;
 
-   if (cache->blob_get_cb) {
-      uint32_t blob;
-      return cache->blob_get_cb(key, CACHE_KEY_SIZE, &blob, sizeof(uint32_t));
-   }
-
    /* Initialize path if not initialized yet. */
    if (cache->path_init_failed ||
        (!cache->path && !disk_cache_path_init(cache)))
@@ -1281,12 +1241,4 @@ disk_cache_compute_key(struct disk_cache *cache, const void *data, size_t size,
    _mesa_sha1_final(&ctx, key);
 }
 
-void
-disk_cache_set_callbacks(struct disk_cache *cache, disk_cache_put_cb put,
-                         disk_cache_get_cb get)
-{
-   cache->blob_put_cb = put;
-   cache->blob_get_cb = get;
-}
-
 #endif /* ENABLE_SHADER_CACHE */
diff --git a/src/util/disk_cache.h b/src/util/disk_cache.h
index f84840fb5c..488b297ead 100644
--- a/src/util/disk_cache.h
+++ b/src/util/disk_cache.h
@@ -50,14 +50,6 @@ typedef uint8_t cache_key[CACHE_KEY_SIZE];
 #define CACHE_ITEM_TYPE_UNKNOWN  0x0
 #define CACHE_ITEM_TYPE_GLSL     0x1
 
-typedef void
-(*disk_cache_put_cb) (const void *key, signed long keySize,
-                      const void *value, signed long valueSize);
-
-typedef signed long
-(*disk_cache_get_cb) (const void *key, signed long keySize,
-                      void *value, signed long valueSize);
-
 struct cache_item_metadata {
    /**
     * The cache item type. This could be used to identify a GLSL cache item,
@@ -215,10 +207,6 @@ void
 disk_cache_compute_key(struct disk_cache *cache, const void *data, size_t size,
                        cache_key key);
 
-void
-disk_cache_set_callbacks(struct disk_cache *cache, disk_cache_put_cb put,
-                         disk_cache_get_cb get);
-
 #else
 
 static inline struct disk_cache *
@@ -272,13 +260,6 @@ disk_cache_compute_key(struct disk_cache *cache, const void *data, size_t size,
    return;
 }
 
-static inline void
-disk_cache_set_callbacks(struct disk_cache *cache, disk_cache_put_cb put,
-                         disk_cache_get_cb get)
-{
-   return;
-}
-
 #endif /* ENABLE_SHADER_CACHE */
 
 #ifdef __cplusplus
-- 
2.14.3