diff options
| author | David McFarland <[email protected]> | 2018-10-23 21:51:09 -0300 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2018-10-26 14:49:22 +1100 |
| commit | 07a00a8729d709a4c43c828c64242c226607f09a (patch) | |
| tree | ec5fd349e3367c66aa3c5550eccffda1b853df0d /src/gallium/drivers/r600 | |
| parent | 3d198926a487cefc0316c2c4d1ebb20ff8ebf535 (diff) | |
util: Change remaining uint32 cache ids to sha1
After discussion with Timothy Arceri. disk_cache_get_function_identifier
was using only the first byte of the sha1 build-id. Replace
disk_cache_get_function_identifier with implementation from
radv_get_build_id. Instead of writing a uint32_t it now writes to a
mesa_sha1. All drivers using disk_cache_get_function_identifier are
updated accordingly.
Reviewed-by: Timothy Arceri <[email protected]>
Fixes: 83ea8dd99bb1 ("util: add disk_cache_get_function_identifier()")
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe_common.c | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c index 6b581242a18..e7c645611d7 100644 --- a/src/gallium/drivers/r600/r600_pipe_common.c +++ b/src/gallium/drivers/r600/r600_pipe_common.c @@ -854,27 +854,28 @@ static void r600_disk_cache_create(struct r600_common_screen *rscreen) if (rscreen->debug_flags & DBG_ALL_SHADERS) return; - uint32_t mesa_id; - if (disk_cache_get_function_identifier(r600_disk_cache_create, - &mesa_id)) { - char *mesa_id_str; - int res = -1; - - res = asprintf(&mesa_id_str, "%u", mesa_id); - if (res != -1) { - /* These flags affect shader compilation. */ - uint64_t shader_debug_flags = - rscreen->debug_flags & - (DBG_FS_CORRECT_DERIVS_AFTER_KILL | - DBG_UNSAFE_MATH); - - rscreen->disk_shader_cache = - disk_cache_create(r600_get_family_name(rscreen), - mesa_id_str, - shader_debug_flags); - free(mesa_id_str); - } - } + struct mesa_sha1 ctx; + unsigned char sha1[20]; + char cache_id[20 * 2 + 1]; + + _mesa_sha1_init(&ctx); + if (!disk_cache_get_function_identifier(r600_disk_cache_create, + &ctx)) + return; + + _mesa_sha1_final(&ctx, sha1); + disk_cache_format_hex_id(cache_id, sha1, 20 * 2); + + /* These flags affect shader compilation. */ + uint64_t shader_debug_flags = + rscreen->debug_flags & + (DBG_FS_CORRECT_DERIVS_AFTER_KILL | + DBG_UNSAFE_MATH); + + rscreen->disk_shader_cache = + disk_cache_create(r600_get_family_name(rscreen), + cache_id, + shader_debug_flags); } static struct disk_cache *r600_get_disk_shader_cache(struct pipe_screen *pscreen) |