chore(canvas): 2.0.2

Author: triniwiz

Cargo.toml

@@ -58,7 +58,7 @@ opt-level = "z"
 [workspace.dependencies.wgt]
 package = "wgpu-types"
 git = "https://github.com/triniwiz/wgpu"
-rev = "4fb84f5a325d73d21416a2244d1cc062925350ef"
+rev = "7e0f39f"
 
 
 
@@ -77,8 +77,18 @@ canvas-c = { path = "./crates/canvas-c" }
 skia-safe = { version = "0.93.1", features = ["textlayout"] }
 itertools = "0.14.0"
 ustr = "1.1.0"
-wgpu-core = { git = "https://github.com/triniwiz/wgpu", rev = "4fb84f5a325d73d21416a2244d1cc062925350ef", features = ["wgsl"] }
-wgpu-hal = { git = "https://github.com/triniwiz/wgpu", rev = "4fb84f5a325d73d21416a2244d1cc062925350ef" }
+wgpu-core = { git = "https://github.com/triniwiz/wgpu", rev = "7e0f39f", features = ["wgsl"] }
+wgpu-hal = { git = "https://github.com/triniwiz/wgpu", rev = "7e0f39f" }
 ureq = "2.10.1"
 jni = "0.21.1"
-regex-lite = "0.1.9"
+regex-lite = "0.1.9"
+objc2 = { version = "0.6.3", default-features = false }
+objc2-core-foundation = { version = "0.3.2", default-features = false }
+objc2-metal = { version = "0.3.2", default-features = false, features = ["MTLCommandBuffer", "MTLCommandQueue", "MTLDrawable", "MTLPixelFormat", "MTLTexture", "MTLDevice", "objc2-core-foundation"] }
+objc2-foundation = { version = "0.3.2", features = ["NSGeometry", "NSData", "NSAutoreleasePool", "NSDictionary", "NSObject", "NSValue", "NSString"] }
+objc2-quartz-core = { version = "0.3.2", default-features = false, features = ["std",
+    "objc2-core-foundation",
+    "CALayer",
+    "CAMetalLayer",
+    "objc2-metal"] }
+core-foundation = "0.10.1"

README.md

@@ -1,3 +1,4 @@
+- [@nativescript/audio-context](packages/audio-context/README.md)
 - [@nativescript/canvas](packages/canvas/README.md)
 - [@nativescript/canvas-babylon](packages/canvas-babylon/README.md)
 - [@nativescript/canvas-chartjs](packages/canvas-chartjs/README.md)

crates/canvas-2d/Cargo.toml

@@ -4,13 +4,13 @@ version = "2.0.0"
 edition = "2021"
 
 [features]
-metal = ["skia-safe/metal", "canvas-core/metal"]
-gl = ["skia-safe/gl"]
+metal = ["skia-safe/metal", "canvas-core/mtl"]
+gl = ["skia-safe/gl", "canvas-core/gl"]
 vulkan = ["skia-safe/vulkan", "canvas-core/vulkan"]
 default = ["gl"]
 
 [dependencies]
-canvas-core = { workspace = true, features = ["2d"] }
+canvas-core = { workspace = true, features = ["2d", "gl"] }
 parking_lot.workspace = true
 ustr.workspace = true
 base64 = "0.22.1"
@@ -25,6 +25,10 @@ ash = { version = "0.38.0", optional = true, features = ["libloading"] }
 raw-window-handle.workspace = true
 bitflags = "2.6.0"
 regex-lite = { workspace = true }
+
 [target.'cfg(any(target_os = "ios", target_os="macos"))'.dependencies]
 foreign-types-shared = "0.3.1"
-objc2-foundation = { version = "0.2.2", features = ["NSAutoreleasePool"] }
+objc2 = {workspace = true}
+objc2-foundation = { workspace = true }
+objc2-metal = { workspace = true }
+objc2-quartz-core = { workspace = true }

crates/canvas-2d/src/context/surface_metal.rs

@@ -1,12 +1,15 @@
 use crate::context::paths::path::Path;
 use crate::context::text_styles::text_direction::TextDirection;
 use crate::context::{Context, State, SurfaceData, SurfaceEngine, SurfaceState};
+use canvas_core::context_attributes::ColorSpace;
 use canvas_core::gpu::metal::MetalContext;
 use foreign_types_shared::ForeignTypeRef;
+use objc2::rc::Retained;
+use objc2_metal::MTLTexture;
+use objc2_quartz_core::CAMetalDrawable;
 use skia_safe::gpu::mtl::TextureInfo;
 use skia_safe::{gpu, Color, ColorType};
 use std::os::raw::c_void;
-use canvas_core::context_attributes::ColorSpace;
 
 #[cfg(feature = "metal")]
 impl Context {
@@ -35,19 +38,19 @@ impl Context {
                 None,
             ) {
                 surface.canvas().draw_color(Color::RED, None);
-                
+
                 // surface
                 //     .canvas()
                 //     .draw_image(snapshot, skia_safe::Point::new(0.0, 0.0), None);
-                 context.flush_surface(&mut surface);
-                 context.flush_submit_and_sync_cpu();
+                context.flush_surface(&mut surface);
+                context.flush_submit_and_sync_cpu();
 
                 return true;
             }
         }
         false
     }
-  
+
     pub fn new_metal(
         view: *mut c_void,
         density: f32,
@@ -56,7 +59,7 @@ impl Context {
         font_color: i32,
         ppi: f32,
         direction: TextDirection,
-        color_space: ColorSpace
+        color_space: ColorSpace,
     ) -> Self {
         let mtl_context = MetalContext::new(view);
         let backend = unsafe {
@@ -71,7 +74,8 @@ impl Context {
         let mut context = gpu::direct_contexts::make_metal(&backend, None).unwrap();
 
         let drawable = mtl_context.drawable().unwrap();
-        let info = unsafe { TextureInfo::new(drawable.texture().as_ptr() as gpu::mtl::Handle) };
+        let info =
+            unsafe { TextureInfo::new(Retained::as_ptr(&drawable.texture()) as gpu::mtl::Handle) };
         let bt = unsafe {
             gpu::backend_textures::make_mtl(
                 (width as i32, height as i32),
@@ -103,7 +107,7 @@ impl Context {
                 engine: SurfaceEngine::Metal,
                 state: Default::default(),
                 is_opaque: !alpha,
-                color_space
+                color_space,
             },
             surface,
             surface_state: Default::default(),
@@ -134,7 +138,7 @@ impl Context {
         font_color: i32,
         ppi: f32,
         direction: TextDirection,
-        color_space: ColorSpace
+        color_space: ColorSpace,
     ) -> Self {
         let mut mtl_context = unsafe { MetalContext::new_device_queue(view, device, queue) };
         let backend = unsafe {
@@ -144,7 +148,7 @@ impl Context {
 
         let mut context = gpu::direct_contexts::make_metal(&backend, None).unwrap();
         let drawable = mtl_context.current_drawable().unwrap();
-        let info = unsafe { TextureInfo::new(drawable.texture().as_ptr() as gpu::mtl::Handle) };
+        let info = unsafe { TextureInfo::new(Retained::as_ptr(&drawable.texture()) as gpu::mtl::Handle) };
         let bt = unsafe {
             gpu::backend_textures::make_mtl(
                 (width as i32, height as i32),
@@ -176,7 +180,7 @@ impl Context {
                 engine: SurfaceEngine::Metal,
                 state: Default::default(),
                 is_opaque: !alpha,
-                color_space
+                color_space,
             },
             surface,
             surface_state: Default::default(),
@@ -206,7 +210,7 @@ impl Context {
         font_color: i32,
         ppi: f32,
         direction: TextDirection,
-        color_space: ColorSpace
+        color_space: ColorSpace,
     ) -> Self {
         let mtl_context = MetalContext::new_offscreen(width, height);
         let backend = unsafe {
@@ -221,7 +225,7 @@ impl Context {
         let mut context = gpu::direct_contexts::make_metal(&backend, None).unwrap();
 
         let drawable = mtl_context.drawable().unwrap();
-        let info = unsafe { TextureInfo::new(drawable.texture().as_ptr() as gpu::mtl::Handle) };
+        let info = unsafe { TextureInfo::new(Retained::as_ptr(&drawable.texture()) as gpu::mtl::Handle) };
         let bt = unsafe {
             gpu::backend_textures::make_mtl(
                 (width as i32, height as i32),
@@ -253,7 +257,7 @@ impl Context {
                 engine: SurfaceEngine::Metal,
                 state: Default::default(),
                 is_opaque: !alpha,
-                color_space
+                color_space,
             },
             surface,
             surface_state: Default::default(),
@@ -293,7 +297,7 @@ impl Context {
             if let Some(drawable) = context.next_drawable() {
                 info = unsafe {
                     Some(TextureInfo::new(
-                        drawable.texture().as_ptr() as gpu::mtl::Handle
+                        Retained::as_ptr(&drawable.texture()) as gpu::mtl::Handle
                     ))
                 };
             }
@@ -357,7 +361,7 @@ impl Context {
                 let texture = drawable.texture();
                 width = texture.width();
                 height = texture.height();
-                info = unsafe { Some(TextureInfo::new(texture.as_ptr() as gpu::mtl::Handle)) };
+                info = unsafe { Some(TextureInfo::new(Retained::as_ptr(&drawable.texture()) as gpu::mtl::Handle)) };
             }
         }
 

crates/canvas-c/Cargo.toml

@@ -34,13 +34,13 @@ image = { version = "0.25.5", optional = true }
 display-link = { version = "0.2.0" }
 wgpu-core = { workspace = true, features = ["wgsl", "metal"] }
 wgpu-hal = { workspace = true, features = ["metal"] }
-objc2-foundation = { version = "0.2.2", features = ["NSGeometry", "NSData", "NSAutoreleasePool"] }
-metal = { version = "0.30.0" }
+objc2-foundation = { workspace = true }
+objc2-metal = { workspace = true }
 
 [target.'cfg(target_os="macos")'.dependencies]
 wgpu-core = { workspace = true, features = ["wgsl", "metal"] }
 wgpu-hal = { workspace = true, features = ["metal"] }
-metal = { version = "0.30.0" }
+objc2-metal = { workspace = true }
 
 [target.'cfg(target_os="android")'.dependencies]
 ndk = { version = "0.7.0", features = ["bitmap"] }

crates/canvas-c/src/c2d/context.rs

@@ -209,7 +209,7 @@ impl CanvasRenderingContext2D {
 
         let mut flush = true;
 
-        // metal will execute the flush_and_render_to_surface in the draw call
+        
         #[cfg(feature = "metal")]
         {
             if self.engine == Engine::Metal {
@@ -311,7 +311,10 @@ pub extern "C" fn canvas_native_raf_release(value: *mut crate::Raf) {
     if value.is_null() {
         return;
     }
-    let _ = unsafe { std::sync::Arc::decrement_strong_count(value) };
+    canvas_native_raf_stop_and_clear(value, 100);
+    unsafe {
+        drop(Box::from_raw(value));
+    }
 }
 
 #[cfg(any(target_os = "android", target_os = "ios"))]
@@ -1343,8 +1346,7 @@ pub extern "C" fn canvas_native_context_set_fill_style(
     context.context.set_fill_style(style.0.clone())
 }
 
-/// Move-semantics variant: takes ownership of the PaintStyle, avoiding clone.
-/// The caller must NOT use or release the style pointer after this call.
+
 #[no_mangle]
 pub extern "C" fn canvas_native_context_set_fill_style_owned(
     context: *mut CanvasRenderingContext2D,
@@ -1378,8 +1380,7 @@ pub extern "C" fn canvas_native_context_set_stroke_style(
     context.context.set_stroke_style(style.0.clone())
 }
 
-/// Move-semantics variant: takes ownership of the PaintStyle, avoiding clone.
-/// The caller must NOT use or release the style pointer after this call.
+
 #[no_mangle]
 pub extern "C" fn canvas_native_context_set_stroke_style_owned(
     context: *mut CanvasRenderingContext2D,

crates/canvas-c/src/c2d/paint/gradient.rs

@@ -23,8 +23,6 @@ pub extern "C" fn canvas_native_gradient_add_color_stop(
     }
 }
 
-/// Add a color stop using pre-parsed RGBA values (0-255 each).
-/// Skips CSS color string parsing entirely.
 #[no_mangle]
 pub extern "C" fn canvas_native_gradient_add_color_stop_rgba(
     style: *mut PaintStyle,

crates/canvas-c/src/webgpu/enums.rs

@@ -126,7 +126,6 @@ pub enum CanvasTextureViewDimension {
 }
 
 impl CanvasTextureViewDimension {
-    /// Get the texture dimension required of this texture view dimension.
     pub fn compatible_texture_dimension(self) -> CanvasTextureViewDimension {
         match self {
             Self::D1 => CanvasTextureViewDimension::D1,

crates/canvas-c/src/webgpu/error.rs

@@ -73,26 +73,15 @@ pub(crate) fn handle_error_fatal(
     cause: impl Error + Send + Sync + 'static,
     operation: &'static str,
 ) {
-    // panic!(
-    //     "Error in {operation}: {f}",
-    //     f = format_error(context, &cause)
-    // );
-
-    // log::error!("Error in {operation}: {f}",
-    //     f = error);
-
+    // Print a detailed validation error tree to help debugging.
+    let formatted = format_error(_global, &cause);
     let error = cause;
 
     #[cfg(target_os = "android")]
-    log::error!("Error in {operation}: {error}");
+    log::error!("Error in {operation}: {error}\n{formatted}");
 
     #[cfg(not(target_os = "android"))]
-    println!("Error in {operation}: {error}");
-
-
-
-    // log::error!("Error in {operation}: {f}",
-    //     f = format_error(global, &cause))
+    println!("Error in {operation}: {error}\n{formatted}");
 }
 
 #[repr(C)]

crates/canvas-c/src/webgpu/gpu.rs

@@ -23,10 +23,6 @@ impl Into<wgt::PowerPreference> for CanvasGPUPowerPreference {
     }
 }
 
-/// - `Core` (default) — full WebGPU feature set.
-/// - `Compatibility` — relaxed capability set; on Android this selects the GLES
-///   backend which provides the widest device coverage (mirrors what a browser
-///   would do on devices that lack Vulkan 1.1+).
 #[repr(C)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
 pub enum CanvasGPUFeatureLevel {
@@ -49,7 +45,6 @@ impl From<CanvasGPUFeatureLevel> for wgt::FeatureLevel {
 pub struct CanvasGPURequestAdapterOptions {
     pub power_preference: CanvasGPUPowerPreference,
     pub force_fallback_adapter: bool,
-    /// Requested feature level. Defaults to `Core`.
     pub feature_level: CanvasGPUFeatureLevel,
 }
 
@@ -181,38 +176,25 @@ pub unsafe extern "C" fn canvas_native_webgpu_request_adapter(
 
             #[cfg(target_os = "android")]
             {
-                // `Compatibility` feature level maps naturally to the GLES backend:
-                // it provides the widest device coverage and matches the relaxed
-                // capability set implied by the spec's compatibility level.
                 if options.feature_level == CanvasGPUFeatureLevel::Compatibility {
                     global.request_adapter(&opts, wgt::Backends::GL, None)
                 } else {
-                    // Core: try Vulkan first, preferring hardware over software.
                     let vulkan_adapter = global.request_adapter(&opts, wgt::Backends::VULKAN, None);
 
                     let is_hardware_vulkan = vulkan_adapter.as_ref().map_or(false, |id| {
-                        // device_type == Cpu means SwiftShader or similar software renderer.
                         global.adapter_get_info(*id).device_type != wgt::DeviceType::Cpu
                     });
 
                     if is_hardware_vulkan {
-                        // Hardware Vulkan — best case.
                         vulkan_adapter
                     } else {
-                        // No hardware Vulkan.  Try GLES next (widest device support).
                         let gl_adapter = global.request_adapter(&opts, wgt::Backends::GL, None);
                         if gl_adapter.is_ok() {
-                            // GLES is available — prefer it over software Vulkan and drop
-                            // the software adapter to avoid a resource leak.
                             if let Ok(id) = vulkan_adapter {
                                 global.adapter_drop(id);
                             }
                             gl_adapter
                         } else {
-                            // GLES unavailable (e.g. Android emulator without host GPU).
-                            // Fall back to the software Vulkan adapter so the caller gets
-                            // *something* rather than null — the JS layer can decide whether
-                            // to proceed or retry with featureLevel:'compatibility'.
                             vulkan_adapter
                         }
                     }
@@ -227,10 +209,6 @@ pub unsafe extern "C" fn canvas_native_webgpu_request_adapter(
 
         let adapter = adapter_id.map(|adapter_id| {
             let mut features = build_features(global.adapter_features(adapter_id));
-            // "core-features-and-limits" is a WebGPU spec marker that signals the device
-            // was created with Core feature level (all mandatory WebGPU features/limits).
-            // Compatibility mode explicitly opts out of this guarantee, so the feature
-            // must be absent when featureLevel == Compatibility.
             if options.feature_level != CanvasGPUFeatureLevel::Compatibility {
                 features.push("core-features-and-limits");
             }