Skip to content

Commit 860c90a

Browse files
build: Fix Build.gn with Graph.DebugInfo (KhronosGroup#6688)
KhronosGroup#6666 (comment) is breaking the `build.gn` for VVL... I just grabbed the commit before, so VVL is good I tried to copy-and-paste a fix, zero idea how to actually test it, but seems like it should work for someone who knows GN better
1 parent 83876d9 commit 860c90a

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

BUILD.gn

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ action("spvtools_core_tables") {
5252
f8=rebase_path("${grammar_dir}/extinst.spv-amd-shader-ballot.grammar.json", root_build_dir)
5353
f9=rebase_path("${grammar_dir}/extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json", root_build_dir)
5454
f10=rebase_path("${grammar_dir}/extinst.spv-amd-shader-trinary-minmax.grammar.json", root_build_dir)
55+
f11=rebase_path("${grammar_dir}/extinst.nonsemantic.graph.debuginfo.grammar.json", root_build_dir)
5556

5657
sources = [
5758
"utils/Table/__init__.py",
@@ -64,6 +65,7 @@ action("spvtools_core_tables") {
6465
"${grammar_dir}/extinst.nonsemantic.clspvreflection.grammar.json",
6566
"${grammar_dir}/extinst.nonsemantic.shader.debuginfo.100.grammar.json",
6667
"${grammar_dir}/extinst.nonsemantic.vkspreflection.grammar.json",
68+
"${grammar_dir}/extinst.nonsemantic.graph.debuginfo.grammar.json",
6769
"${grammar_dir}/extinst.opencl.debuginfo.100.grammar.json",
6870
"${grammar_dir}/extinst.opencl.std.100.grammar.json",
6971
"${grammar_dir}/extinst.spv-amd-gcn-shader.grammar.json",
@@ -90,6 +92,7 @@ action("spvtools_core_tables") {
9092
"--extinst=,${f8}",
9193
"--extinst=,${f9}",
9294
"--extinst=,${f10}",
95+
"--extinst=,${f11}",
9396
"--core-tables-body-output",
9497
rebase_path(core_tables_body_file, root_build_dir),
9598
"--core-tables-header-output",
@@ -160,6 +163,10 @@ spvtools_language_header("vkdebuginfo") {
160163
name = "NonSemanticShaderDebugInfo"
161164
grammar_file = "${spirv_headers}/include/spirv/unified1/extinst.nonsemantic.shader.debuginfo.grammar.json"
162165
}
166+
spvtools_language_header("graphdebuginfo") {
167+
name = "NonSemanticGraphDebugInfo"
168+
grammar_file = "${spirv_headers}/include/spirv/unified1/extinst.nonsemantic.graph.debuginfo.grammar.json"
169+
}
163170

164171
config("spvtools_public_config") {
165172
include_dirs = [ "include" ]
@@ -219,6 +226,7 @@ group("spvtools_language_headers") {
219226
":spvtools_language_header_cldebuginfo100",
220227
":spvtools_language_header_debuginfo",
221228
":spvtools_language_header_vkdebuginfo",
229+
":spvtools_language_header_graphdebuginfo",
222230
]
223231
}
224232

@@ -229,6 +237,7 @@ static_library("spvtools") {
229237
":spvtools_language_header_cldebuginfo100",
230238
":spvtools_language_header_debuginfo",
231239
":spvtools_language_header_vkdebuginfo",
240+
":spvtools_language_header_graphdebuginfo",
232241
]
233242

234243
sources = [
@@ -388,6 +397,7 @@ static_library("spvtools_val") {
388397
":spvtools_language_header_cldebuginfo100",
389398
":spvtools_language_header_debuginfo",
390399
":spvtools_language_header_vkdebuginfo",
400+
":spvtools_language_header_graphdebuginfo",
391401
]
392402
public_deps = [ ":spvtools_headers" ]
393403

@@ -656,6 +666,7 @@ static_library("spvtools_opt") {
656666
":spvtools_headers",
657667
":spvtools_language_header_cldebuginfo100",
658668
":spvtools_language_header_vkdebuginfo",
669+
":spvtools_language_header_graphdebuginfo",
659670
]
660671

661672
if (build_with_chromium) {
@@ -1259,6 +1270,7 @@ if (build_with_chromium && spvtools_build_executables) {
12591270
":spvtools_language_header_cldebuginfo100",
12601271
":spvtools_language_header_debuginfo",
12611272
":spvtools_language_header_vkdebuginfo",
1273+
":spvtools_language_header_graphdebuginfo",
12621274
":spvtools_tools_io",
12631275
":spvtools_val",
12641276
"//testing/gmock",

0 commit comments

Comments
 (0)