Merge pull request godotengine#114484 from stuartcarnie/metal_refactor_and_fixes

Metal: Refactor; fix dynamic uniforms; acyclic render graph support

Author: Repiteo

COPYRIGHT.txt

@@ -432,6 +432,11 @@ Comment: meshoptimizer
 Copyright: 2016-2024, Arseny Kapoulkine
 License: Expat
 
+Files: thirdparty/metal-cpp/*
+Comment: metal-cpp
+Copyright: 2024, Apple Inc.
+License: Apache-2.0
+
 Files: thirdparty/mingw-std-threads/*
 Comment: mingw-std-threads
 Copyright: 2016, Mega Limited

drivers/apple/foundation_helpers.h

@@ -30,20 +30,32 @@
 
 #pragma once
 
+#ifdef __OBJC__
 #import <Foundation/NSString.h>
+#else
+#include <Foundation/NSString.hpp>
+#endif
 
 class String;
 template <typename T>
 class CharStringT;
 
 using CharString = CharStringT<char>;
 
+template <typename T>
+class Span;
+
 namespace conv {
 
+#ifdef __OBJC__
 /**
  * Converts a Godot String to an NSString without allocating an intermediate UTF-8 buffer.
  * */
 NSString *to_nsstring(const String &p_str);
+/**
+ * Converts a Godot String to an NSString without allocating an intermediate UTF-8 buffer.
+ * */
+NSString *to_nsstring(Span<char> p_str);
 /**
  * Converts a Godot CharString to an NSString without allocating an intermediate UTF-8 buffer.
  * */
@@ -52,5 +64,24 @@ NSString *to_nsstring(const CharString &p_str);
  * Converts an NSString to a Godot String without allocating intermediate buffers.
  * */
 String to_string(NSString *p_str);
+#else
+/**
+ * Converts a Godot String to an NSString without allocating an intermediate UTF-8 buffer.
+ * */
+NS::String *to_nsstring(const String &p_str);
+/**
+ * Converts a Godot String to an NSString without allocating an intermediate UTF-8 buffer.
+ * */
+NS::String *to_nsstring(Span<char> p_str);
+/**
+ * Converts a Godot CharString to an NSString without allocating an intermediate UTF-8 buffer.
+ * */
+NS::String *to_nsstring(const CharString &p_str);
+/**
+ * Converts an NSString to a Godot String without allocating intermediate buffers.
+ * */
+String to_string(NS::String *p_str);
+
+#endif
 
 } //namespace conv

drivers/apple/foundation_helpers.mm

@@ -31,6 +31,7 @@
 #import "foundation_helpers.h"
 
 #import "core/string/ustring.h"
+#import "core/templates/span.h"
 
 #import <CoreFoundation/CFString.h>
 
@@ -42,6 +43,12 @@
 								  encoding:NSUTF32LittleEndianStringEncoding];
 }
 
+NSString *to_nsstring(Span<char> p_str) {
+	return [[NSString alloc] initWithBytes:(const void *)p_str.ptr()
+									length:p_str.size()
+								  encoding:NSASCIIStringEncoding];
+}
+
 NSString *to_nsstring(const CharString &p_str) {
 	return [[NSString alloc] initWithBytes:(const void *)p_str.ptr()
 									length:p_str.length()

drivers/apple_embedded/SCsub

@@ -27,6 +27,9 @@ setup_swift_builder(
 vulkan_dir = "#thirdparty/vulkan"
 env_apple_embedded.Prepend(CPPPATH=[vulkan_dir, vulkan_dir + "/include"])
 
+# Use bundled metal-cpp headers
+env_apple_embedded.Prepend(CPPPATH=["#thirdparty/metal-cpp"])
+
 # Driver source files
 env_apple_embedded.add_source_files(env_apple_embedded.drivers_sources, "*.mm")
 env_apple_embedded.add_source_files(env_apple_embedded.drivers_sources, "*.swift")

drivers/apple_embedded/display_server_apple_embedded.mm

@@ -96,7 +96,7 @@
 	if (rendering_driver == "metal") {
 		if (@available(iOS 14.0, *)) {
 			layer = [GDTAppDelegateService.viewController.godotView initializeRenderingForDriver:@"metal"];
-			wpd.metal.layer = (CAMetalLayer *)layer;
+			wpd.metal.layer = (__bridge CA::MetalLayer *)layer;
 			rendering_context = memnew(RenderingContextDriverMetal);
 		} else {
 			OS::get_singleton()->alert("Metal is only supported on iOS 14.0 and later.");

drivers/apple_embedded/os_apple_embedded.mm

@@ -51,6 +51,7 @@
 #import <UIKit/UIKit.h>
 #import <dlfcn.h>
 #include <sys/sysctl.h>
+#include <iterator>
 
 #if defined(RD_ENABLED)
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"

drivers/metal/SCsub

@@ -3,6 +3,9 @@ from misc.utility.scons_hints import *
 
 Import("env")
 
+# If we're using Metal, we need metal-cpp.
+env.Prepend(CPPPATH=["#thirdparty/metal-cpp/"])
+
 env_metal = env.Clone()
 
 # Thirdparty source files
@@ -23,6 +26,11 @@ thirdparty_sources = [
 ]
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
+# Include metal-cpp
+thirdparty_sources += [
+    "#thirdparty/metal-cpp/metal_cpp.cpp",
+]
+
 env_metal.Prepend(CPPPATH=[thirdparty_dir, thirdparty_dir + "/include"])
 env_metal.Prepend(CPPPATH=[thirdparty_spirv_headers_dir + "include/spirv/unified1"])
 
@@ -48,7 +56,6 @@ env_metal.Append(CCFLAGS=["-fmodules", "-fcxx-modules"])
 
 driver_obj = []
 
-env_metal.add_source_files(driver_obj, "*.mm")
 env_metal.add_source_files(driver_obj, "*.cpp")
 env.drivers_sources += driver_obj