@nativescript/canvas 2.0.0-rc.1 → 2.0.0-rc.2

package/WebGPU/GPUQueue.js

@@ -37,7 +37,7 @@ export class GPUQueue {
             }
             else if (typeof source.source.tagName === 'string' && source.source.tagName === 'CANVAS') {
                 if (source.source._canvas instanceof Canvas) {
-                    src.source = source.source._canvas._canvas.native;
+                    src.source = source.source._canvas.native;
                 }
             }
         }

package/WebGPU/GPUQueue.js.map

@@ -1 +1 @@
-{"version":3,"file":"GPUQueue.js","sourceRoot":"","sources":["../../../../packages/canvas/WebGPU/GPUQueue.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GPUQueue.js","sourceRoot":"","sources":["../../../../packages/canvas/WebGPU/GPUQueue.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/canvas",
-  "version": "2.0.0-rc.1",
+  "version": "2.0.0-rc.2",
   "description": "DOM Canvas API for NativeScript",
   "main": "index",
   "typings": "index.d.ts",

package/platforms/ios/CanvasNative.xcframework/Info.plist

@@ -10,15 +10,18 @@
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>CanvasNative.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -26,18 +29,15 @@
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>CanvasNative.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/canvas_ios.h

@@ -40,6 +40,11 @@ int64_t canvas_native_ios_create_2d_context(void *view,
                                             float ppi,
                                             int32_t direction);
 
+void canvas_native_ios_update_2d_webgpu_surface(int64_t view,
+                                                float width,
+                                                float height,
+                                                int64_t context);
+
 void canvas_native_ios_update_webgl_surface(int64_t view,
                                             int32_t _width,
                                             int32_t _height,
@@ -138,6 +143,15 @@ int64_t canvas_native_ios_create_2d_context_metal(void *view,
                                                   float ppi,
                                                   int32_t direction);
 
+int64_t canvas_native_ios_create_2d_context_metal_offscreen(float width,
+                                                            float height,
+                                                            bool alpha,
+                                                            float density,
+                                                            uintptr_t samples,
+                                                            int32_t font_color,
+                                                            float ppi,
+                                                            int32_t direction);
+
 int64_t canvas_native_ios_create_2d_context_metal_device_queue(void *view,
                                                                void *device,
                                                                void *queue,