util/glsl2spirv: cleanup list extension
authorDylan Baker <dylan.c.baker@intel.com>
Tue, 1 Nov 2022 20:29:48 +0000 (13:29 -0700)
committerMarge Bot <emma+marge@anholt.net>
Thu, 10 Nov 2022 21:14:17 +0000 (21:14 +0000)
- consistently use list.extend instead of list +=, which has gotchas
- condense list extension calls when possible

Reviewed-by: Luis Felipe Strano Moraes <luis.strano@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19449>

src/util/glsl2spirv.py

index e4ae22f..c41f1fd 100644 (file)
@@ -145,22 +145,23 @@ def process_file(args: Arguments) -> None:
     cmd_list = ["glslangValidator"]
 
     if args.Olib:
-        cmd_list += ["--keep-uncalled"]
+        cmd_list.append("--keep-uncalled")
 
     if args.vn is not None:
-        cmd_list += ["--variable-name", args.vn]
+        cmd_list.extend(["--variable-name", args.vn])
 
     if args.extra is not None:
         cmd_list.append(args.extra)
 
     if args.create_entry is not None:
-        cmd_list += ["--entry-point", args.create_entry]
-
-    cmd_list.append("-V")
-    cmd_list += ["-o", args.output]
-    cmd_list += ["-S", args.stage]
-
-    cmd_list.append(copy_file)
+        cmd_list.extend(["--entry-point", args.create_entry])
+
+    cmd_list.extend([
+        '-V',
+        '-o', args.output,
+        '-S', args.stage,
+        copy_file,
+    ])
 
     ret = subprocess.run(cmd_list, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=30)
     if ret.returncode != 0: