From 533b962b29640c204d5511ea8eff544fd0415d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Tue, 17 Mar 2026 14:07:33 -0400
Subject: [PATCH] driconf: rename sha1 option to blake3

it's already blake3 except the name

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40383>
---
 src/util/driconf_static.py                  | 8 ++++----
 src/util/tests/drirc_configdir/00-test.conf | 2 +-
 src/util/xmlconfig.c                        | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/util/driconf_static.py b/src/util/driconf_static.py
index f16aac5e14c..33dd2635ea8 100644
--- a/src/util/driconf_static.py
+++ b/src/util/driconf_static.py
@@ -47,7 +47,7 @@ class Application(object):
         self.name = xml.attrib['name']
         self.executable = xml.attrib.get('executable', None)
         self.executable_regexp = xml.attrib.get('executable_regexp', None)
-        self.sha1 = xml.attrib.get('sha1', None)
+        self.blake3 = xml.attrib.get('blake3', None)
         self.application_name_match = xml.attrib.get('application_name_match', None)
         self.application_versions = xml.attrib.get('application_versions', None)
         self.options = []
@@ -121,7 +121,7 @@ struct driconf_application {
     const char *name;
     const char *executable;
     const char *executable_regexp;
-    const char *sha1;
+    const char *blake3;
     const char *application_name_match;
     const char *application_versions;
     unsigned num_options;
@@ -185,8 +185,8 @@ static const struct driconf_application ${device.cname}_applications[] = {
 %        if application.executable_regexp:
       .executable_regexp = "${application.executable_regexp}",
 %        endif
-%        if application.sha1:
-      .sha1 = "${application.sha1}",
+%        if application.blake3:
+      .blake3 = "${application.blake3}",
 %        endif
 %        if application.application_name_match:
       .application_name_match = "${application.application_name_match}",
diff --git a/src/util/tests/drirc_configdir/00-test.conf b/src/util/tests/drirc_configdir/00-test.conf
index a8692d16177..4ec89240fdf 100644
--- a/src/util/tests/drirc_configdir/00-test.conf
+++ b/src/util/tests/drirc_configdir/00-test.conf
@@ -7,7 +7,7 @@
    <!ATTLIST application  name CDATA #REQUIRED
                           executable CDATA #IMPLIED
                           executable_regexp CDATA #IMPLIED
-                          sha1 CDATA #IMPLIED
+                          blake3 CDATA #IMPLIED
                           application_name_match CDATA #IMPLIED
                           application_versions CDATA #IMPLIED>
    <!ELEMENT engine       (option+)>
diff --git a/src/util/xmlconfig.c b/src/util/xmlconfig.c
index 49486bd1242..5922dc8704e 100644
--- a/src/util/xmlconfig.c
+++ b/src/util/xmlconfig.c
@@ -752,7 +752,7 @@ parseAppAttr(struct OptConfData *data, const char **attr)
       if (!strcmp(attr[i], "name")) /* not needed here */;
       else if (!strcmp(attr[i], "executable")) exec = attr[i+1];
       else if (!strcmp(attr[i], "executable_regexp")) exec_regexp = attr[i+1];
-      else if (!strcmp(attr[i], "sha1")) blake3 = attr[i+1];
+      else if (!strcmp(attr[i], "blake3")) blake3 = attr[i+1];
       else if (!strcmp(attr[i], "application_name_match"))
          application_name_match = attr[i+1];
       else if (!strcmp(attr[i], "application_versions"))
@@ -1184,7 +1184,7 @@ parseStaticConfig(struct OptConfData *data)
             "name", a->name,
             "executable", a->executable,
             "executable_regexp", a->executable_regexp,
-            "sha1", a->sha1,
+            "blake3", a->blake3,
             "application_name_match", a->application_name_match,
             "application_versions", a->application_versions,
             NULL