fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 15:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util/glsl2spirv: use f-strings

Browse source 
Which are both faster and easier to read

Reviewed-by: Luis Felipe Strano Moraes <luis.strano@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19449>
This commit is contained in:
Dylan Baker 2022-11-01 13:29:21 -07:00 • committed by Marge Bot
parent 7c88c3a05b
commit 9a165945a9
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/util/glsl2spirv.py
View file

@ -80,9 +80,9 @@ def create_include_guard(lines: T.List[str], filename: str) -> T.List[str]:
filename = filename.replace('.', '_')
upper_name = filename.upper()
guard_head = ["#ifndef {}\n".format(upper_name),
"#define {}\n".format(upper_name)]
guard_tail = ["\n#endif // {}\n".format(upper_name)]
guard_head = [f"#ifndef {upper_name}\n",
f"#define {upper_name}\n"]
guard_tail = [f"\n#endif // {upper_name}\n"]
# remove '#pragma once'
for idx, l in enumerate(lines):
@ -96,7 +96,7 @@ def create_include_guard(lines: T.List[str], filename: str) -> T.List[str]:
def convert_to_static_variable(lines: T.List[str], varname: str) -> T.List[str]:
for idx, l in enumerate(lines):
if varname in l:
lines[idx] = "static " + lines[idx]
lines[idx] = f"static {l}"
return lines
raise RuntimeError(f'Did not find {varname}, this is unexpected')
@ -104,7 +104,7 @@ def convert_to_static_variable(lines: T.List[str], varname: str) -> T.List[str]:
def override_version(lines: T.List[str], glsl_version: str) -> T.List[str]:
for idx, l in enumerate(lines):
if '#version ' in l:
lines[idx] = "#version {}\n".format(glsl_version)
lines[idx] = f"#version {glsl_version}\n"
return lines
raise RuntimeError('Did not find #version directive, this is unexpected')
@ -128,7 +128,7 @@ def preprocess_file(args: Arguments, origin_file: T.TextIO) -> str:
lines = origin_file.readlines()
if args.create_entry is not None:
lines.append("\nvoid {}()".format(args.create_entry) + "{}\n")
lines.append(f"\nvoid {args.create_entry}() {{}}\n")
if args.glsl_ver is not None:
override_version(lines, args.glsl_ver)