util/glsl2spirv: fix appending extra flags

The variable is called `extra`, but what's written is `extra - flags`,
and `flags` is undefined, so if the variable was ever passed there would
be an uncaught exception.

fixes: 9786d9ef2abb45a4e832cf1347581e3ca3aae9f0

Reviewed-by: Luis Felipe Strano Moraes <luis.strano@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19449>
(cherry picked from commit 4ffa8a9ac010f3db79b1e872f7e664a4470cb981)

diff --git a/.pick_status.json b/.pick_status.json
index 0a3a90c..9697ef8 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3028,7 +3028,7 @@
         "description": "util/glsl2spirv: fix appending extra flags",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "9786d9ef2abb45a4e832cf1347581e3ca3aae9f0"
     },

diff --git a/src/util/glsl2spirv.py b/src/util/glsl2spirv.py
index 8b765c9..a0acefd 100644 (file)
--- a/src/util/glsl2spirv.py
+++ b/src/util/glsl2spirv.py
@@ -136,7 +136,7 @@ def process_file(args):
             cmd_list += ["--variable-name", args.vn]
 
         if args.extra is not None:
-            cmd_list.append(args.extra-flags)
+            cmd_list.append(args.extra)
 
         if args.create_entry is not None:
             cmd_list += ["--entry-point", args.create_entry]