From 86d008d1124c873708f4c4461c7958b1978dc596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cle=CC=81ment=20Foucault?= Date: Mon, 1 Jan 2024 11:28:41 +1300 Subject: [PATCH] Metal: Fix missing new line characters This broke compilation of some shaders --- source/blender/gpu/metal/mtl_shader.mm | 2 +- source/blender/gpu/metal/mtl_shader_generator.mm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/gpu/metal/mtl_shader.mm b/source/blender/gpu/metal/mtl_shader.mm index b10dfa1a4cb..f77d119f509 100644 --- a/source/blender/gpu/metal/mtl_shader.mm +++ b/source/blender/gpu/metal/mtl_shader.mm @@ -220,7 +220,7 @@ void MTLShader::fragment_shader_from_glsl(MutableSpan sources) ss << sources[i] << '\n'; } - ss << "#line 1 \"msl_wrapper_code\""; + ss << "#line 1 \"msl_wrapper_code\"\n"; shd_builder_->glsl_fragment_source_ = ss.str(); } diff --git a/source/blender/gpu/metal/mtl_shader_generator.mm b/source/blender/gpu/metal/mtl_shader_generator.mm index 94d55b33440..994e4d2c77b 100644 --- a/source/blender/gpu/metal/mtl_shader_generator.mm +++ b/source/blender/gpu/metal/mtl_shader_generator.mm @@ -1061,8 +1061,8 @@ bool MTLShader::generate_msl_from_glsl(const shader::ShaderCreateInfo *info) /* Setup `stringstream` for populating generated MSL shader vertex/frag shaders. */ std::stringstream ss_vertex; std::stringstream ss_fragment; - ss_vertex << "#line 1 \"msl_wrapper_code\""; - ss_fragment << "#line 1 \"msl_wrapper_code\""; + ss_vertex << "#line 1 \"msl_wrapper_code\"\n"; + ss_fragment << "#line 1 \"msl_wrapper_code\"\n"; if (bool(info->builtins_ & BuiltinBits::TEXTURE_ATOMIC) && MTLBackend::get_capabilities().supports_texture_atomics)