diff options
Diffstat (limited to 'src/compiler/glsl')
| -rw-r--r-- | src/compiler/glsl/shader_cache.cpp | 20 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/cache_test.c | 12 |
2 files changed, 23 insertions, 9 deletions
diff --git a/src/compiler/glsl/shader_cache.cpp b/src/compiler/glsl/shader_cache.cpp index aa6c067d041..3af14be9a1d 100644 --- a/src/compiler/glsl/shader_cache.cpp +++ b/src/compiler/glsl/shader_cache.cpp @@ -1406,23 +1406,37 @@ shader_cache_write_program_metadata(struct gl_context *ctx, write_program_resource_list(metadata, prog); + struct cache_item_metadata cache_item_metadata; + cache_item_metadata.type = CACHE_ITEM_TYPE_GLSL; + cache_item_metadata.keys = + (cache_key *) malloc(prog->NumShaders * sizeof(cache_key)); + cache_item_metadata.num_keys = prog->NumShaders; + + if (!cache_item_metadata.keys) + goto fail; + char sha1_buf[41]; for (unsigned i = 0; i < prog->NumShaders; i++) { disk_cache_put_key(cache, prog->Shaders[i]->sha1); + memcpy(cache_item_metadata.keys[i], prog->Shaders[i]->sha1, + sizeof(cache_key)); if (ctx->_Shader->Flags & GLSL_CACHE_INFO) { _mesa_sha1_format(sha1_buf, prog->Shaders[i]->sha1); fprintf(stderr, "marking shader: %s\n", sha1_buf); } } - disk_cache_put(cache, prog->data->sha1, metadata->data, metadata->size); - - blob_destroy(metadata); + disk_cache_put(cache, prog->data->sha1, metadata->data, metadata->size, + &cache_item_metadata); if (ctx->_Shader->Flags & GLSL_CACHE_INFO) { _mesa_sha1_format(sha1_buf, prog->data->sha1); fprintf(stderr, "putting program metadata in cache: %s\n", sha1_buf); } + +fail: + free(cache_item_metadata.keys); + blob_destroy(metadata); } bool diff --git a/src/compiler/glsl/tests/cache_test.c b/src/compiler/glsl/tests/cache_test.c index 3796ce61704..8e7912c71b6 100644 --- a/src/compiler/glsl/tests/cache_test.c +++ b/src/compiler/glsl/tests/cache_test.c @@ -268,7 +268,7 @@ test_put_and_get(void) expect_equal(size, 0, "disk_cache_get with non-existent item (size)"); /* Simple test of put and get. */ - disk_cache_put(cache, blob_key, blob, sizeof(blob)); + disk_cache_put(cache, blob_key, blob, sizeof(blob), NULL); /* disk_cache_put() hands things off to a thread give it some time to * finish. @@ -283,7 +283,7 @@ test_put_and_get(void) /* Test put and get of a second item. */ disk_cache_compute_key(cache, string, sizeof(string), string_key); - disk_cache_put(cache, string_key, string, sizeof(string)); + disk_cache_put(cache, string_key, string, sizeof(string), NULL); /* disk_cache_put() hands things off to a thread give it some time to * finish. @@ -324,7 +324,7 @@ test_put_and_get(void) disk_cache_compute_key(cache, one_KB, 1024, one_KB_key); one_KB_key[0] = blob_key[0]; - disk_cache_put(cache, one_KB_key, one_KB, 1024); + disk_cache_put(cache, one_KB_key, one_KB, 1024, NULL); free(one_KB); @@ -367,8 +367,8 @@ test_put_and_get(void) setenv("MESA_GLSL_CACHE_MAX_SIZE", "1M", 1); cache = disk_cache_create("test", "make_check", 0); - disk_cache_put(cache, blob_key, blob, sizeof(blob)); - disk_cache_put(cache, string_key, string, sizeof(string)); + disk_cache_put(cache, blob_key, blob, sizeof(blob), NULL); + disk_cache_put(cache, string_key, string, sizeof(string), NULL); /* disk_cache_put() hands things off to a thread give it some time to * finish. @@ -394,7 +394,7 @@ test_put_and_get(void) disk_cache_compute_key(cache, one_MB, 1024 * 1024, one_MB_key); one_MB_key[0] = blob_key[0]; - disk_cache_put(cache, one_MB_key, one_MB, 1024 * 1024); + disk_cache_put(cache, one_MB_key, one_MB, 1024 * 1024, NULL); free(one_MB); |