Mesa (main): intel/genxml: Simplify prefix handling for field value lists

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: cd7d3c7ae3c87564b0e32b868cd801668789def2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd7d3c7ae3c87564b0e32b868cd801668789def2

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Oct 29 03:05:21 2021 -0700

intel/genxml: Simplify prefix handling for field value lists

When a <field> tag has multiple <value> children, listing symbolic names
for possible field values, we generate #defines for each value, with an
optional prefix.  I don't know why, but this code was checking whether
self.default is None.  We want to generate the same list of #defines,
with a prefix, regardless of whether the field has a default value
specified or not.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13809>

---

 src/intel/genxml/gen_pack_header.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/intel/genxml/gen_pack_header.py b/src/intel/genxml/gen_pack_header.py
index fa9eae51718..e9ba0003f51 100644
--- a/src/intel/genxml/gen_pack_header.py
+++ b/src/intel/genxml/gen_pack_header.py
@@ -333,10 +333,7 @@ class Field(object):
 
         print("   %-36s %s%s;" % (type, self.name, dim))
 
-        prefix = ""
-        if self.values and self.default is None:
-            if self.prefix:
-                prefix = self.prefix + "_"
+        prefix = self.prefix + '_' if self.prefix else ''
 
         for value in self.values:
             print("#define %-40s %d" % (prefix + value.name, value.value))