summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRhys Perry <pendingchaos02@gmail.com>2020-10-12 14:39:27 +0100
committerEric Engestrom <eric@engestrom.ch>2020-10-14 19:29:35 +0200
commitb6d88656306d14776c8c02a70a6c9cec0c226855 (patch)
treef5a1b4ac212c244af252df5c269cbe77249b74a9
parent36dc0d83552281802cdf39b424f217b348956df2 (diff)
scons: fix SPIR-V -> NIR build
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com> Tested-by: Vinson Lee <vlee@freedesktop.org> Reviewed-by: Roland Scheidegger <sroland@vmware.com> Fixes: 18f9fc919e1 ('spirv: add and use a generator id enum') Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7096> (cherry picked from commit 044d213086be1a7d2f9b9dc16766d37852bd95b2)
-rw-r--r--.pick_status.json2
-rw-r--r--src/compiler/SConscript.spirv7
2 files changed, 8 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 112b9f0c290..8f328791965 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5404,7 +5404,7 @@
"description": "scons: fix SPIR-V -> NIR build",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "18f9fc919e1b5e7511cc3085dd990b7ca037f38e"
},
diff --git a/src/compiler/SConscript.spirv b/src/compiler/SConscript.spirv
index 49410881d0b..65ced55cbca 100644
--- a/src/compiler/SConscript.spirv
+++ b/src/compiler/SConscript.spirv
@@ -39,6 +39,13 @@ env.CodeGenerate(
command = python_cmd + ' $SCRIPT $SOURCE $TARGET'
)
+env.CodeGenerate(
+ target = 'spirv/vtn_generator_ids.h',
+ script = 'spirv/vtn_generator_ids_h.py',
+ source = ['spirv/spir-v.xml'],
+ command = python_cmd + ' $SCRIPT $SOURCE $TARGET'
+)
+
# parse Makefile.sources
source_lists = env.ParseSourceList('Makefile.sources')