Module: Mesa Branch: staging/22.3 Commit: 8aa43904222556d7ae15be876032c7d16600253c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8aa43904222556d7ae15be876032c7d16600253c
Author: Dylan Baker <[email protected]> Date: Tue Nov 1 12:40:21 2022 -0700 util/glsl2spirv: fix type error in argument handling args.Olib is set to `store_true`, which means it will always be `True` or `False`, this means that the we always, unconditionally, add `--keep-uncalled` to the command line. 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 76e3b482be125cc0a2edd75bdeb14d4a6e9232fb) --- .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 5f269bce1d3..fe3f27d1fe8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -553,7 +553,7 @@ "description": "util/glsl2spirv: fix type error in argument handling", "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 f11bf612cb1..8b765c987eb 100644 --- a/src/util/glsl2spirv.py +++ b/src/util/glsl2spirv.py @@ -129,7 +129,7 @@ def process_file(args): cmd_list = ["glslangValidator"] - if args.Olib is not None: + if args.Olib: cmd_list += ["--keep-uncalled"] if args.vn is not None:
