Mesa (master): genxml: Fix gen_pack_header.py crash when field type is invalid.
Kenneth Graunke
kwg at kemper.freedesktop.org
Mon Apr 24 22:14:38 UTC 2017
Module: Mesa
Branch: master
Commit: 6a40ccec4b232fc04edd9eb3c047f949e4422612
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a40ccec4b232fc04edd9eb3c047f949e4422612
Author: Rafael Antognolli <rafael.antognolli at intel.com>
Date: Fri Apr 21 15:11:17 2017 -0700
genxml: Fix gen_pack_header.py crash when field type is invalid.
Just return earlier in that case. Also set prefix to an empty string, so
we don't get to use it undefined.
Signed-off-by: Rafael Antognolli <rafael.antognolli at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/intel/genxml/gen_pack_header.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/intel/genxml/gen_pack_header.py b/src/intel/genxml/gen_pack_header.py
index 1b1949ff8a..020dbe40a6 100644
--- a/src/intel/genxml/gen_pack_header.py
+++ b/src/intel/genxml/gen_pack_header.py
@@ -273,14 +273,14 @@ class Field(object):
return
else:
print("#error unhandled type: %s" % self.type)
+ return
print(" %-36s %s%s;" % (type, self.name, dim))
+ prefix = ""
if len(self.values) > 0 and self.default == None:
if self.prefix:
prefix = self.prefix + "_"
- else:
- prefix = ""
for value in self.values:
print("#define %-40s %d" % (prefix + value.name, value.value))
More information about the mesa-commit
mailing list