From 50d73a42baa1eb5cba998994713cf9de144b0add Mon Sep 17 00:00:00 2001
From: Rhys Perry <pendingchaos02@gmail.com>
Date: Mon, 12 Oct 2020 14:39:27 +0100
Subject: [PATCH] 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)
---
 .pick_status.json             | 2 +-
 src/compiler/SConscript.spirv | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 44dbf34ddd6..521349c67dd 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4954,7 +4954,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')