Merge pull request godotengine#101198 from Calinou/editor-metalfx-show-options-on-all-platforms

akien-mga · akien-mga · commit 558a18fbb717 · 2025-01-07T10:14:54.000+01:00
Show MetalFX options in the Scaling 3D Mode enum on all platforms
diff --git a/servers/rendering_server.cpp b/servers/rendering_server.cpp
@@ -3670,10 +3670,9 @@ void RenderingServer::init() {
 		{
 			Vector<String> mode_hints_arr = { "Bilinear (Fastest)", "FSR 1.0 (Fast)", "FSR 2.2 (Slow)" };
 			mode_hints = String(",").join(mode_hints_arr);
-#ifdef METAL_ENABLED
+
 			mode_hints_arr.push_back("MetalFX (Spatial)");
 			mode_hints_arr.push_back("MetalFX (Temporal)");
-#endif
 			mode_hints_metal = String(",").join(mode_hints_arr);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -3670,10 +3670,9 @@ void RenderingServer::init() {`
`3670`	`3670`	`{`
`3671`	`3671`	`Vector<String> mode_hints_arr = { "Bilinear (Fastest)", "FSR 1.0 (Fast)", "FSR 2.2 (Slow)" };`
`3672`	`3672`	`mode_hints = String(",").join(mode_hints_arr);`
`3673`		`-#ifdef METAL_ENABLED`
	`3673`	`+`
`3674`	`3674`	`mode_hints_arr.push_back("MetalFX (Spatial)");`
`3675`	`3675`	`mode_hints_arr.push_back("MetalFX (Temporal)");`
`3676`		`-#endif`
`3677`	`3676`	`mode_hints_metal = String(",").join(mode_hints_arr);`
`3678`	`3677`	`}`
`3679`	`3678`