AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-10-18 11:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Treat spir-v.xml as utf-8 (#5306)

Browse Source 
* Treat spir-v.xml as utf-8

Treat the input file as utf-8, and configure the XML parser to use
the utf-8 encoding.

The Chromium build was breaking when trying to parse the XML
file as ASCII.

* Use Python io.open

Try to fix the android-ndk-build flow.  It seems to be using
an old Python. For example, Python 2.6 builtin function open()
did not support the 'encoding' keyword argument.  But its io.open
method did support it.
This commit is contained in:
David Neto 2023-07-07 12:25:26 -04:00 committed by GitHub
parent 0f3bea06ef
commit e751c7e7db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/generate_registry_tables.py
View File

@ -15,8 +15,9 @@
"""Generates the vendor tool table from the SPIR-V XML registry.""" """Generates the vendor tool table from the SPIR-V XML registry."""
import errno import errno
import io
import os.path import os.path
import xml.etree.ElementTree from xml.etree.ElementTree import XML, XMLParser, TreeBuilder
def mkdir_p(directory): def mkdir_p(directory):
@ -78,8 +79,9 @@ def main():
help='output file for SPIR-V generators table') help='output file for SPIR-V generators table')
args = parser.parse_args() args = parser.parse_args()
with open(args.xml) as xml_in: with io.open(args.xml, encoding='utf-8') as xml_in:
registry = xml.etree.ElementTree.fromstring(xml_in.read()) parser = XMLParser(target=TreeBuilder(), encoding='utf-8')
registry = XML(xml_in.read(), parser=parser)
mkdir_p(os.path.dirname(args.generator_output)) mkdir_p(os.path.dirname(args.generator_output))
with open(args.generator_output, 'w') as f: with open(args.generator_output, 'w') as f: