From 8f0b3472e78344a857fedb929e5499b9e99b6ffc Mon Sep 17 00:00:00 2001 From: skilletfun Date: Fri, 11 Oct 2024 19:39:18 +0300 Subject: [PATCH] Shorter build out_file --- gles3_builders.py | 5 +---- glsl_builders.py | 10 ++-------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/gles3_builders.py b/gles3_builders.py index 721e482800b..e0aa5e77ec9 100644 --- a/gles3_builders.py +++ b/gles3_builders.py @@ -199,10 +199,7 @@ def build_gles3_header( header_data = header_data or GLES3HeaderStruct() include_file_in_gles3_header(filename, header_data, 0) - if optional_output_filename is None: - out_file = filename + ".gen.h" - else: - out_file = optional_output_filename + out_file = optional_output_filename or filename + ".gen.h" with open(out_file, "w", encoding="utf-8", newline="\n") as fd: defspec = 0 diff --git a/glsl_builders.py b/glsl_builders.py index 01cabf6aaa9..d299c4d4e45 100644 --- a/glsl_builders.py +++ b/glsl_builders.py @@ -98,10 +98,7 @@ def build_rd_header( header_data = header_data or RDHeaderStruct() include_file_in_rd_header(filename, header_data, 0) - if optional_output_filename is None: - out_file = filename + ".gen.h" - else: - out_file = optional_output_filename + out_file = optional_output_filename or filename + ".gen.h" out_file_base = out_file out_file_base = out_file_base[out_file_base.rfind("/") + 1 :] @@ -180,10 +177,7 @@ def build_raw_header( header_data = header_data or RAWHeaderStruct() include_file_in_raw_header(filename, header_data, 0) - if optional_output_filename is None: - out_file = filename + ".gen.h" - else: - out_file = optional_output_filename + out_file = optional_output_filename or filename + ".gen.h" out_file_base = out_file.replace(".glsl.gen.h", "_shader_glsl") out_file_base = out_file_base[out_file_base.rfind("/") + 1 :]