real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Fixes SPIRV compile script for newer versions of spirv-reflect.

Browse Source 
Differential Revision: https://code.wildfiregames.com/D5123
This was SVN commit r27845.
This commit is contained in:
Vladislav Belov 2023-09-20 17:25:14 +00:00
parent b8cd3a0268
commit 5214a4c073
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/tools/spirv/compile.py
View File

@ -116,7 +116,7 @@ def compile_and_reflect(input_mod_path, output_mod_path, dependencies, stage, pa
preprocessor_output_path = os.path.abspath(os.path.join(os.path.dirname(__file__), 'preprocessed_file.glsl'))
execute(command[:-2] + ['-g', '-E', '-o', preprocessor_output_path])
raise ValueError(err)
ret, out, err = execute(['spirv-reflect', '-y', output_path])
ret, out, err = execute(['spirv-reflect', '-y','-v', '1', output_path])
if ret:
sys.stderr.write('Command returned {}:\nCommand: {}\nInput path: {}\nOutput path: {}\nError: {}\n'.format(
ret, ' '.join(command), input_path, output_path, err))
@ -142,7 +142,7 @@ def compile_and_reflect(input_mod_path, output_mod_path, dependencies, stage, pa
'offset': node['absolute_offset'],
'size': node['size'],
})
assert module['push_constants'][0]['name'] == 'DrawUniforms'
assert module['push_constants'][0]['type_description']['type_name'] == 'DrawUniforms'
assert module['push_constants'][0]['size'] <= 128
add_push_constants(module['push_constants'][0], push_constants)
descriptor_sets = []
@ -258,7 +258,7 @@ def output_xml_tree(tree, path):
attributes = ''
for attribute_name in sorted(node.attrib.keys()):
attributes += ' {}="{}"'.format(attribute_name, node.attrib[attribute_name])
if node:
if len(node) > 0:
handle.write('{}<{}{}>\n'.format(indent, node.tag, attributes))
for child in node:
output_xml_node(child, handle, depth + 1)