AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2025-01-12 09:20:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

GN: Fix build for debuginfo codegen. (#4536)

Browse Source 
Fixes #4535
This commit is contained in:
Jamie Madill 2021-09-23 10:18:06 -04:00 committed by GitHub
parent 1d48824bae
commit 134d763f45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
BUILD.gn
View File

@ -225,29 +225,6 @@ template("spvtools_vendor_table") {
} }
} }
template("spvtools_vendor_table_local") {
assert(defined(invoker.name), "Need name in $target_name generation.")
action("spvtools_vendor_tables_" + target_name) {
script = "utils/generate_grammar_tables.py"
name = invoker.name
extinst_vendor_grammar = "source/extinst.${name}.grammar.json"
extinst_file = "${target_gen_dir}/${name}.insts.inc"
args = [
"--extinst-vendor-grammar",
rebase_path(extinst_vendor_grammar, root_build_dir),
"--vendor-insts-output",
rebase_path(extinst_file, root_build_dir),
"--vendor-operand-kind-prefix",
invoker.operand_kind_prefix,
]
inputs = [ extinst_vendor_grammar ]
outputs = [ extinst_file ]
}
}
action("spvtools_generators_inc") { action("spvtools_generators_inc") {
script = "utils/generate_registry_tables.py" script = "utils/generate_registry_tables.py"
@ -333,13 +310,12 @@ spvtools_vendor_tables = [
"nonsemantic.clspvreflection", "nonsemantic.clspvreflection",
"...nil...", "...nil...",
], ],
[
"nonsemantic.shader.debuginfo.100",
"SHDEBUG100_",
],
] ]
spvtools_vendor_tables_local = [ [
"nonsemantic.shader.debuginfo.100",
"SHDEBUG100_",
] ]
foreach(table_def, spvtools_vendor_tables) { foreach(table_def, spvtools_vendor_tables) {
spvtools_vendor_table(table_def[0]) { spvtools_vendor_table(table_def[0]) {
name = table_def[0] name = table_def[0]
@ -347,13 +323,6 @@ foreach(table_def, spvtools_vendor_tables) {
} }
} }
foreach(table_def, spvtools_vendor_tables_local) {
spvtools_vendor_table_local(table_def[0]) {
name = table_def[0]
operand_kind_prefix = table_def[1]
}
}
config("spvtools_public_config") { config("spvtools_public_config") {
include_dirs = [ "include" ] include_dirs = [ "include" ]
} }
@ -421,10 +390,6 @@ static_library("spvtools") {
target_name = table_def[0] target_name = table_def[0]
deps += [ ":spvtools_vendor_tables_$target_name" ] deps += [ ":spvtools_vendor_tables_$target_name" ]
} }
foreach(table_def, spvtools_vendor_tables_local) {
target_name = table_def[0]
deps += [ ":spvtools_vendor_tables_$target_name" ]
}
sources = [ sources = [
"source/assembly_grammar.cpp", "source/assembly_grammar.cpp",
@ -610,14 +575,14 @@ static_library("spvtools_opt") {
"source/opt/constants.h", "source/opt/constants.h",
"source/opt/control_dependence.cpp", "source/opt/control_dependence.cpp",
"source/opt/control_dependence.h", "source/opt/control_dependence.h",
"source/opt/convert_to_sampled_image_pass.cpp",
"source/opt/convert_to_sampled_image_pass.h",
"source/opt/convert_to_half_pass.cpp", "source/opt/convert_to_half_pass.cpp",
"source/opt/convert_to_half_pass.h", "source/opt/convert_to_half_pass.h",
"source/opt/convert_to_sampled_image_pass.cpp",
"source/opt/convert_to_sampled_image_pass.h",
"source/opt/copy_prop_arrays.cpp", "source/opt/copy_prop_arrays.cpp",
"source/opt/copy_prop_arrays.h", "source/opt/copy_prop_arrays.h",
"source/opt/dataflow.h",
"source/opt/dataflow.cpp", "source/opt/dataflow.cpp",
"source/opt/dataflow.h",
"source/opt/dead_branch_elim_pass.cpp", "source/opt/dead_branch_elim_pass.cpp",
"source/opt/dead_branch_elim_pass.h", "source/opt/dead_branch_elim_pass.h",
"source/opt/dead_insert_elim_pass.cpp", "source/opt/dead_insert_elim_pass.cpp",