Merge pull request #103185 from stuartcarnie/metal_lazy

Repiteo · Repiteo · commit 5cfa89ed0edb · 2025-02-24T19:52:23.000-06:00
Metal: Compile `MTLLibrary` on demand when pipeline is created
diff --git a/drivers/metal/rendering_device_driver_metal.mm b/drivers/metal/rendering_device_driver_metal.mm
@@ -4082,9 +4082,14 @@ bool isArrayTexture(MTLTextureType p_type) {
 		context_driver(p_context_driver) {
 	DEV_ASSERT(p_context_driver != nullptr);
 
+#if TARGET_OS_OSX
 	if (String res = OS::get_singleton()->get_environment("GODOT_MTL_SHADER_LOAD_STRATEGY"); res == U"lazy") {
 		_shader_load_strategy = ShaderLoadStrategy::LAZY;
 	}
+#else
+	// Always use the lazy strategy on other OSs like iOS, tvOS, or visionOS.
+	_shader_load_strategy = ShaderLoadStrategy::LAZY;
+#endif
 }
 
 RenderingDeviceDriverMetal::~RenderingDeviceDriverMetal() {

Original file line number	Diff line number	Diff line change
`@@ -4082,9 +4082,14 @@ bool isArrayTexture(MTLTextureType p_type) {`
`4082`	`4082`	`context_driver(p_context_driver) {`
`4083`	`4083`	`DEV_ASSERT(p_context_driver != nullptr);`
`4084`	`4084`
	`4085`	`+#if TARGET_OS_OSX`
`4085`	`4086`	`if (String res = OS::get_singleton()->get_environment("GODOT_MTL_SHADER_LOAD_STRATEGY"); res == U"lazy") {`
`4086`	`4087`	`_shader_load_strategy = ShaderLoadStrategy::LAZY;`
`4087`	`4088`	`}`
	`4089`	`+#else`
	`4090`	`+ // Always use the lazy strategy on other OSs like iOS, tvOS, or visionOS.`
	`4091`	`+ _shader_load_strategy = ShaderLoadStrategy::LAZY;`
	`4092`	`+#endif`
`4088`	`4093`	`}`
`4089`	`4094`
`4090`	`4095`	`RenderingDeviceDriverMetal::~RenderingDeviceDriverMetal() {`