From cd7d3c7ae3c87564b0e32b868cd801668789def2 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 29 Oct 2021 03:05:21 -0700 Subject: [PATCH] intel/genxml: Simplify prefix handling for field value lists When a tag has multiple 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 Part-of: --- 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))