From a9a4028fd7136ee2ee7bf0efa8179e7a6312f008 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 24 Jan 2017 21:21:09 +0000 Subject: util/sha1: rework _mesa_sha1_{init,final} Rather than having an extra memory allocation [that we currently do not and act accordingly] just make the API take an pointer to a stack allocated instance. This and follow-up steps will effectively make the _mesa_sha1_foo simple define/inlines around their SHA1 counterparts. Signed-off-by: Emil Velikov Reviewed-by: Grazvydas Ignotas --- src/intel/vulkan/anv_pipeline_cache.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/intel/vulkan/anv_pipeline_cache.c') diff --git a/src/intel/vulkan/anv_pipeline_cache.c b/src/intel/vulkan/anv_pipeline_cache.c index a8ea80f51f5..0b677a49f3d 100644 --- a/src/intel/vulkan/anv_pipeline_cache.c +++ b/src/intel/vulkan/anv_pipeline_cache.c @@ -205,23 +205,23 @@ anv_hash_shader(unsigned char *hash, const void *key, size_t key_size, const struct anv_pipeline_layout *pipeline_layout, const VkSpecializationInfo *spec_info) { - struct mesa_sha1 *ctx; + struct mesa_sha1 ctx; - ctx = _mesa_sha1_init(); - _mesa_sha1_update(ctx, key, key_size); - _mesa_sha1_update(ctx, module->sha1, sizeof(module->sha1)); - _mesa_sha1_update(ctx, entrypoint, strlen(entrypoint)); + _mesa_sha1_init(&ctx); + _mesa_sha1_update(&ctx, key, key_size); + _mesa_sha1_update(&ctx, module->sha1, sizeof(module->sha1)); + _mesa_sha1_update(&ctx, entrypoint, strlen(entrypoint)); if (pipeline_layout) { - _mesa_sha1_update(ctx, pipeline_layout->sha1, + _mesa_sha1_update(&ctx, pipeline_layout->sha1, sizeof(pipeline_layout->sha1)); } /* hash in shader stage, pipeline layout? */ if (spec_info) { - _mesa_sha1_update(ctx, spec_info->pMapEntries, + _mesa_sha1_update(&ctx, spec_info->pMapEntries, spec_info->mapEntryCount * sizeof spec_info->pMapEntries[0]); - _mesa_sha1_update(ctx, spec_info->pData, spec_info->dataSize); + _mesa_sha1_update(&ctx, spec_info->pData, spec_info->dataSize); } - _mesa_sha1_final(ctx, hash); + _mesa_sha1_final(&ctx, hash); } static struct anv_shader_bin * -- cgit v1.2.3