Merge pull request #97304 from kroketio/metal-return-logical-device-handle

akien-mga · akien-mga · commit f032af74536b · 2024-10-04T12:58:38.000+02:00
Metal: Implement `texture_create_from_extension`
diff --git a/drivers/metal/rendering_device_driver_metal.mm b/drivers/metal/rendering_device_driver_metal.mm
@@ -358,7 +358,11 @@ _FORCE_INLINE_ MTLSize mipmapLevelSizeFromSize(MTLSize p_size, NSUInteger p_leve
 }
 
 RDD::TextureID RenderingDeviceDriverMetal::texture_create_from_extension(uint64_t p_native_texture, TextureType p_type, DataFormat p_format, uint32_t p_array_layers, bool p_depth_stencil) {
-	ERR_FAIL_V_MSG(RDD::TextureID(), "not implemented");
+	id<MTLTexture> obj = (__bridge id<MTLTexture>)(void *)(uintptr_t)p_native_texture;
+
+	// We only need to create a RDD::TextureID for an existing, natively-provided texture.
+
+	return rid::make(obj);
 }
 
 RDD::TextureID RenderingDeviceDriverMetal::texture_create_shared(TextureID p_original_texture, const TextureView &p_view) {

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,11 @@ _FORCE_INLINE_ MTLSize mipmapLevelSizeFromSize(MTLSize p_size, NSUInteger p_leve`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`RDD::TextureID RenderingDeviceDriverMetal::texture_create_from_extension(uint64_t p_native_texture, TextureType p_type, DataFormat p_format, uint32_t p_array_layers, bool p_depth_stencil) {`
`361`		`- ERR_FAIL_V_MSG(RDD::TextureID(), "not implemented");`
	`361`	`+ id<MTLTexture> obj = (__bridge id<MTLTexture>)(void *)(uintptr_t)p_native_texture;`
	`362`	`+`
	`363`	`+ // We only need to create a RDD::TextureID for an existing, natively-provided texture.`
	`364`	`+`
	`365`	`+ return rid::make(obj);`
`362`	`366`	`}`
`363`	`367`
`364`	`368`	`RDD::TextureID RenderingDeviceDriverMetal::texture_create_shared(TextureID p_original_texture, const TextureView &p_view) {`