Module: Mesa Branch: main Commit: 36480b4d028a8ded90fb715b3e8ce0d01202aa3f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=36480b4d028a8ded90fb715b3e8ce0d01202aa3f
Author: Yonggang Luo <luoyongg...@gmail.com> Date: Tue Dec 5 14:10:56 2023 +0800 intel: Generate source file with utf-8 encoding from mako template Make them generated in consistent way Signed-off-by: Yonggang Luo <luoyongg...@gmail.com> Acked-by: Eric Engestrom <e...@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26515> --- src/intel/genxml/gen_bits_header.py | 2 +- src/intel/isl/gen_format_layout.py | 2 +- src/intel/vulkan/grl/grl_cl_kernel_gen.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/intel/genxml/gen_bits_header.py b/src/intel/genxml/gen_bits_header.py index 7d1efa7f57d..0b16c3b9025 100644 --- a/src/intel/genxml/gen_bits_header.py +++ b/src/intel/genxml/gen_bits_header.py @@ -344,7 +344,7 @@ def main(): assert field field.allowed = True - with open(pargs.output, 'w') as f: + with open(pargs.output, 'w', encoding='utf-8') as f: f.write(TEMPLATE.render(containers=containers, guard=pargs.cpp_guard)) if __name__ == '__main__': diff --git a/src/intel/isl/gen_format_layout.py b/src/intel/isl/gen_format_layout.py index 3a21c27298a..cc1faa545cc 100644 --- a/src/intel/isl/gen_format_layout.py +++ b/src/intel/isl/gen_format_layout.py @@ -281,7 +281,7 @@ def main(): # This generator opens and writes the file itself, and it does so in bytes # mode. This solves the locale problem: Unicode can be rendered even # if the shell calling this script doesn't. - with open(args.out, 'w') as f: + with open(args.out, 'w', encoding='utf-8') as f: formats = [Format(l) for l in reader(args.csv)] try: # This basically does lazy evaluation and initialization, which diff --git a/src/intel/vulkan/grl/grl_cl_kernel_gen.py b/src/intel/vulkan/grl/grl_cl_kernel_gen.py index c7efeff53de..148438e9fa6 100644 --- a/src/intel/vulkan/grl/grl_cl_kernel_gen.py +++ b/src/intel/vulkan/grl/grl_cl_kernel_gen.py @@ -61,7 +61,7 @@ void genX(grl_get_cl_kernel)(struct brw_kernel *kernel, enum grl_cl_kernel id); #endif #endif /* INTEL_GRL_H */ -""", output_encoding='utf-8') +""") TEMPLATE_C = Template(COPYRIGHT + """ /* This file generated from ${filename}, don't edit directly. */ @@ -108,7 +108,7 @@ ${prefix}_grl_get_cl_kernel(struct brw_kernel *kernel, enum grl_cl_kernel id) unreachable("Invalid GRL kernel enum"); } } -""", output_encoding='utf-8') +""") def get_libraries_files(kernel_module): lib_files = [] @@ -201,12 +201,12 @@ def main(): try: if args.out_h: - with open(args.out_h, 'wb') as f: + with open(args.out_h, 'w', encoding='utf-8') as f: f.write(TEMPLATE_H.render(kernels=kernel_c_names, filename=os.path.basename(__file__))) if args.out_c: - with open(args.out_c, 'wb') as f: + with open(args.out_c, 'w', encoding='utf-8') as f: f.write(TEMPLATE_C.render(kernels=kernel_c_names, prefix=args.prefix, filename=os.path.basename(__file__)))
