Work around copyFromTexture not working on iOS with Mono interpreter

ppy · Apr 16, 2023 · f1f8dc0 · f1f8dc0
1 parent 2bd55e7
commit f1f8dc0
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 12 deletions.
diff --git a/src/Veldrid.MetalBindings/MTLBlitCommandEncoder.cs b/src/Veldrid.MetalBindings/MTLBlitCommandEncoder.cs
@@ -123,17 +123,54 @@ public void copyFromTexture(
             MTLTexture destinationTexture,
             UIntPtr destinationSlice,
             UIntPtr destinationLevel,
-            MTLOrigin destinationOrigin)
-            => objc_msgSend(NativePtr, sel_copyFromTexture1,
-                sourceTexture,
-                sourceSlice,
-                sourceLevel,
-                sourceOrigin,
-                sourceSize,
-                destinationTexture,
-                destinationSlice,
-                destinationLevel,
-                destinationOrigin);
+            MTLOrigin destinationOrigin,
+            bool isMacOS)
+        {
+            if (!isMacOS)
+            {
+                copyFromTexture_iOS(
+                    NativePtr,
+                    sourceTexture.NativePtr,
+                    sourceSlice,
+                    sourceLevel,
+                    sourceOrigin,
+                    sourceSize,
+                    destinationTexture.NativePtr,
+                    destinationSlice,
+                    destinationLevel,
+                    destinationOrigin.x,
+                    destinationOrigin.y,
+                    destinationOrigin.z);
+            }
+            else
+            {
+                objc_msgSend(NativePtr, sel_copyFromTexture1,
+                    sourceTexture,
+                    sourceSlice,
+                    sourceLevel,
+                    sourceOrigin,
+                    sourceSize,
+                    destinationTexture,
+                    destinationSlice,
+                    destinationLevel,
+                    destinationOrigin);
+            }
+        }
+
+        [DllImport("@rpath/metal_mono_workaround.framework/metal_mono_workaround", EntryPoint = "copyFromTexture")]
+        private static extern void copyFromTexture_iOS(
+            IntPtr encoder,
+            IntPtr sourceTexture,
+            UIntPtr sourceSlice,
+            UIntPtr sourceLevel,
+            MTLOrigin sourceOrigin,
+            MTLSize sourceSize,
+            IntPtr destinationTexture,
+            UIntPtr destinationSlice,
+            UIntPtr destinationLevel,
+            UIntPtr destinationOriginX,
+            UIntPtr destinationOriginY,
+            UIntPtr destinationOriginZ);
 
         private static readonly Selector sel_copyFromBuffer0 = "copyFromBuffer:sourceOffset:toBuffer:destinationOffset:size:";
         private static readonly Selector sel_copyFromBuffer1 = "copyFromBuffer:sourceOffset:sourceBytesPerRow:sourceBytesPerImage:sourceSize:toTexture:destinationSlice:destinationLevel:destinationOrigin:";

diff --git a/...codeproj/project.xcworkspace/xcuserdata/salman.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/salman.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...Veldrid.MetalBindings/metal-mono-workaround/metal-mono-workaround/metal_mono_workaround.h b/...Veldrid.MetalBindings/metal-mono-workaround/metal-mono-workaround/metal_mono_workaround.h
@@ -12,3 +12,16 @@ void copyFromBuffer(id<MTLBlitCommandEncoder> encoder,
                     NSUInteger destinationOriginX,
                     NSUInteger destinationOriginY,
                     NSUInteger destinationOriginZ);
+
+void copyFromTexture(id<MTLBlitCommandEncoder> encoder,
+                     id<MTLTexture> sourceTexture,
+                     NSUInteger sourceSlice,
+                     NSUInteger sourceLevel,
+                     MTLOrigin sourceOrigin,
+                     MTLSize sourceSize,
+                     id<MTLTexture> destinationTexture,
+                     NSUInteger destinationSlice,
+                     NSUInteger destinationLevel,
+                     NSUInteger destinationOriginX,
+                     NSUInteger destinationOriginY,
+                     NSUInteger destinationOriginZ);
diff --git a/...Veldrid.MetalBindings/metal-mono-workaround/metal-mono-workaround/metal_mono_workaround.m b/...Veldrid.MetalBindings/metal-mono-workaround/metal-mono-workaround/metal_mono_workaround.m
@@ -25,3 +25,27 @@ void copyFromBuffer(id<MTLBlitCommandEncoder> encoder,
            destinationLevel:destinationLevel
           destinationOrigin:MTLOriginMake(destinationOriginX, destinationOriginY, destinationOriginZ)];
 }
+
+void copyFromTexture(id<MTLBlitCommandEncoder> encoder,
+                     id<MTLTexture> sourceTexture,
+                     NSUInteger sourceSlice,
+                     NSUInteger sourceLevel,
+                     MTLOrigin sourceOrigin,
+                     MTLSize sourceSize,
+                     id<MTLTexture> destinationTexture,
+                     NSUInteger destinationSlice,
+                     NSUInteger destinationLevel,
+                     NSUInteger destinationOriginX,
+                     NSUInteger destinationOriginY,
+                     NSUInteger destinationOriginZ)
+{
+    [encoder copyFromTexture:sourceTexture
+                 sourceSlice:sourceSlice
+                 sourceLevel:sourceLevel
+                sourceOrigin:sourceOrigin
+                  sourceSize:sourceSize
+                   toTexture:destinationTexture
+            destinationSlice:destinationSlice
+            destinationLevel:destinationLevel
+           destinationOrigin:MTLOriginMake(destinationOriginX, destinationOriginY, destinationOriginZ)];
+}
diff --git a/src/Veldrid/MTL/MTLCommandList.cs b/src/Veldrid/MTL/MTLCommandList.cs
@@ -671,7 +671,8 @@ protected override void CopyTextureCore(
                         dstMTLTexture.DeviceTexture,
                         (UIntPtr)(dstBaseArrayLayer + layer),
                         (UIntPtr)dstMipLevel,
-                        new MTLOrigin(dstX, dstY, dstZ));
+                        new MTLOrigin(dstX, dstY, dstZ),
+                        _gd.MetalFeatures.IsMacOS);
                 }
             }
         }