godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #110873 from stuartcarnie/fix_metal_baker

Browse Source 
Metal: Fix Metal compiler version inspection
This commit is contained in:
Thaddeus Crews
2025-09-30 11:19:21 -05:00
parent 31b25d5971 d93fe9038d
commit 4a1c1c483b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/metal/rendering_shader_container_metal.mm
View File

@@ -101,7 +101,7 @@ void RenderingShaderContainerMetal::_initialize_toolchain_properties() {
break; break;
} }
Vector<String> parts{ "echo", R"("")", "|", "/usr/bin/xcrun", "-sdk", sdk, "metal", "-E", "-dM", "-x", "metal", "-", "|", "grep", "-E", R"(\"__METAL_VERSION__|__ENVIRONMENT_OS\")" }; Vector<String> parts{ "echo", R"("")", "|", "/usr/bin/xcrun", "-sdk", sdk, "metal", "-E", "-dM", "-x", "metal" };
// Compile metal shaders for the minimum supported target instead of the host machine // Compile metal shaders for the minimum supported target instead of the host machine
if (min_os_version.is_valid()) { if (min_os_version.is_valid()) {
@@ -117,7 +117,8 @@ void RenderingShaderContainerMetal::_initialize_toolchain_properties() {
} }
} }
String s = " "; parts.append_array({ "-", "|", "grep", "-E", R"(\"__METAL_VERSION__|__ENVIRONMENT_OS\")" });
List<String> args = { "-c", String(" ").join(parts) }; List<String> args = { "-c", String(" ").join(parts) };
String r_pipe; String r_pipe;
@@ -147,8 +148,6 @@ void RenderingShaderContainerMetal::_initialize_toolchain_properties() {
break; break;
} }
} }
return;
} }
Error RenderingShaderContainerMetal::compile_metal_source(const char *p_source, const StageData &p_stage_data, Vector<uint8_t> &r_binary_data) { Error RenderingShaderContainerMetal::compile_metal_source(const char *p_source, const StageData &p_stage_data, Vector<uint8_t> &r_binary_data) {