Module: Mesa
Branch: staging/20.0
Commit: 3f0a6cad4d768a132573bc2107b861b773810018
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f0a6cad4d768a132573bc2107b861b773810018
Author: Eric Engestrom <e...@engestrom.ch>
Date: Fri Jun 5 11:26:56 2020 +0200
intel: fix gen_sort_tags.py
The script was failing for me (python 3.8), not sure if this is a recent
python version break or not as I don't know how often people have been
running this script:
Processing ./gen9.xml... Traceback (most recent call last):
File "./gen_sort_tags.py", line 177, in <module>
main()
File "./gen_sort_tags.py", line 170, in main
genxml[:] = enums + sorted_structs.values() + instructions + registers
TypeError: can only concatenate list (not "odict_values") to list
Turning the odict into a list fixes it for me, and the resulting xml
file are identical to before :)
Fixes: 903e142f0d35bc550ffd ("genxml: add a sorting script")
Signed-off-by: Eric Engestrom <e...@engestrom.ch>
Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5352>
(cherry picked from commit 981d07c74a1611d8c308a96f59899fff66674c1a)
---
.pick_status.json | 2 +-
src/intel/genxml/gen_sort_tags.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index 395a7615e33..3f93e35be1a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -643,7 +643,7 @@
"description": "intel: fix gen_sort_tags.py",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "903e142f0d35bc550ffde321987a5b6fca1095eb"
},
diff --git a/src/intel/genxml/gen_sort_tags.py
b/src/intel/genxml/gen_sort_tags.py
index 66b1011cef0..ea6b6d4158b 100644
--- a/src/intel/genxml/gen_sort_tags.py
+++ b/src/intel/genxml/gen_sort_tags.py
@@ -167,7 +167,7 @@ def main():
for r in registers:
r[:] = sorted(r.getchildren(), key=get_start)
- genxml[:] = enums + sorted_structs.values() + instructions + registers
+ genxml[:] = enums + list(sorted_structs.values()) + instructions +
registers
print('<?xml version="1.0" ?>')
print_node(sys.stdout, 0, genxml)
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
