From 282bd2e6dba6c7ba46c1de404787d2f1566b70b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 12 Mar 2026 22:09:29 -0400 Subject: [PATCH] Rename sha words to blake3 Acked-by: Alyssa Rosenzweig Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/compiler/glsl/shader_cache.cpp | 2 +- src/gallium/drivers/iris/iris_disk_cache.c | 2 +- src/gallium/frontends/rusticl/mesa/util/disk_cache.rs | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compiler/glsl/shader_cache.cpp b/src/compiler/glsl/shader_cache.cpp index def1570d608..c56e3a58626 100644 --- a/src/compiler/glsl/shader_cache.cpp +++ b/src/compiler/glsl/shader_cache.cpp @@ -169,7 +169,7 @@ shader_cache_read_program_metadata(struct gl_context *ctx, } /* SSO has an effect on the linked program so include this when generating - * the sha also. + * the blake3 also. */ ralloc_asprintf_append(&buf, "sso: %s\n", prog->SeparateShader ? "T" : "F"); diff --git a/src/gallium/drivers/iris/iris_disk_cache.c b/src/gallium/drivers/iris/iris_disk_cache.c index a270705b935..89df4a75bff 100644 --- a/src/gallium/drivers/iris/iris_disk_cache.c +++ b/src/gallium/drivers/iris/iris_disk_cache.c @@ -331,7 +331,7 @@ iris_disk_cache_init(struct iris_screen *screen) if (INTEL_DEBUG(DEBUG_DISK_CACHE_DISABLE_MASK)) return; - /* array length = strlen("iris_") + sha + nul char */ + /* array length = strlen("iris_") + blake3 + nul char */ char renderer[5 + 40 + 1] = {0}; if (screen->brw) { diff --git a/src/gallium/frontends/rusticl/mesa/util/disk_cache.rs b/src/gallium/frontends/rusticl/mesa/util/disk_cache.rs index 5f9efbb315c..9e377e64b2b 100644 --- a/src/gallium/frontends/rusticl/mesa/util/disk_cache.rs +++ b/src/gallium/frontends/rusticl/mesa/util/disk_cache.rs @@ -80,7 +80,7 @@ impl DiskCacheBorrowed { impl DiskCache { pub fn new(name: &CStr, func_ptrs: &[*mut c_void], flags: u64) -> Option { let mut blake3_ctx = blake3_hasher::default(); - let mut sha = [0; BLAKE3_KEY_LEN as usize]; + let mut blake3 = [0; BLAKE3_KEY_LEN as usize]; let mut cache_id = [0; BLAKE3_HEX_LEN as usize]; let cache = unsafe { @@ -91,8 +91,8 @@ impl DiskCache { return None; } } - _mesa_blake3_final(&mut blake3_ctx, &mut sha); - mesa_bytes_to_hex(cache_id.as_mut_ptr(), sha.as_ptr(), sha.len() as u32); + _mesa_blake3_final(&mut blake3_ctx, &mut blake3); + mesa_bytes_to_hex(cache_id.as_mut_ptr(), blake3.as_ptr(), blake3.len() as u32); disk_cache_create(name.as_ptr(), cache_id.as_ptr(), flags) };