Module: Mesa Branch: staging/22.3 Commit: 18a4af623566f562801637eea34164d1e34eabda URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=18a4af623566f562801637eea34164d1e34eabda
Author: Dylan Baker <[email protected]> Date: Tue Nov 1 12:49:53 2022 -0700 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 <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19449> (cherry picked from commit 4ffa8a9ac010f3db79b1e872f7e664a4470cb981) --- .pick_status.json | 2 +- src/util/glsl2spirv.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index fe3f27d1fe8..c9f974d64a3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -526,7 +526,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 8b765c987eb..a0acefdc091 100644 --- 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]
