feat: update wgpu & skia to the latest

Author: triniwiz

Cargo.toml

@@ -12,6 +12,8 @@ members = [
     "crates/canvas-c",
     "crates/canvas-svg",
     "crates/canvas-napi",
+    "crates/canvas-svg-ios",
+    "crates/canvas-svg-android",
 ]
 
 [profile.release]
@@ -27,7 +29,7 @@ strip = true
 [workspace.dependencies.wgt]
 package = "wgpu-types"
 git = "https://github.com/triniwiz/wgpu"
-rev = "5b4f231697c7808bfade1206c4d420a1221ac0a5"
+rev = "56a46b75f1b400446d0b1139b2435aa95a0d5ab5"
 
 
 
@@ -40,11 +42,12 @@ raw-window-handle = "0.6.2"
 canvas-2d = { path = "./crates/canvas-2d" }
 canvas-core = { path = "./crates/canvas-core" }
 canvas-webgl = { path = "./crates/canvas-webgl" }
+canvas-svg = { path = "./crates/canvas-svg" }
 gl-bindings = { path = "./crates/gl-bindings" }
 canvas-c = { path = "./crates/canvas-c" }
-skia-safe = { version = "0.86.0", features = ["textlayout"] }
+skia-safe = { version = "0.87.0", features = ["textlayout"] }
 itertools = "0.14.0"
-wgpu-core = { git = "https://github.com/triniwiz/wgpu", rev = "5b4f231697c7808bfade1206c4d420a1221ac0a5", features = ["wgsl", "vulkan", "metal", "raw-window-handle"] }
-wgpu-hal = { git = "https://github.com/triniwiz/wgpu", rev = "5b4f231697c7808bfade1206c4d420a1221ac0a5", features = ["metal", "vulkan"] }
+wgpu-core = { git = "https://github.com/triniwiz/wgpu", rev = "56a46b75f1b400446d0b1139b2435aa95a0d5ab5", features = ["wgsl", "vulkan", "metal", "raw-window-handle"] }
+wgpu-hal = { git = "https://github.com/triniwiz/wgpu", rev = "56a46b75f1b400446d0b1139b2435aa95a0d5ab5", features = ["metal", "vulkan"] }
 ureq = "2.10.1"
-jni = "0.21.1"
+jni = "0.21.1"

Makefile

@@ -1,57 +1,61 @@
 ARCHS_IOS = x86_64-apple-ios aarch64-apple-ios aarch64-apple-ios-sim
-# ARCHS_IOS = aarch64-apple-ios-sim
 ARCHS_ANDROID = i686-linux-android x86_64-linux-android aarch64-linux-android armv7-linux-androideabi
-# LIB = libcanvasative.dylib
+
 XCFRAMEWORK = CanvasNative.xcframework
 RUST_LIB = canvasnative
 
-all:GENERATE_HEADERS ios android
+all: GENERATE_HEADERS ios android
 
 ios: $(XCFRAMEWORK)
 
 android: GENERATE_ANDROID
 
-android_svg: GENERATE_ANDROID_SVG
+ios-svg: GENERATE_IOS_SVG
 
-ios_svg: GENERATE_IOS_SVG
+android-svg: GENERATE_ANDROID_SVG
 
 .PHONY: GENERATE_HEADERS
 GENERATE_HEADERS:
 	./tools/scripts/build-headers.sh
 
-# PHONY keyword on make means this is not a file, just an identifier for a target
+# --- iOS builds ---
 .PHONY: $(ARCHS_IOS)
 $(ARCHS_IOS): %:
-	RUSTFLAGS="-Zlocation-detail=none -C panic=abort" cargo +nightly build -Z build-std='std,panic_abort'  -Z build-std-features=panic_immediate_abort --target $@ --release -p canvas-ios
+	RUSTFLAGS="-Zlocation-detail=none -C panic=abort" \
+	cargo +nightly build -Z build-std='std,panic_abort' \
+	    -Z build-std-features=panic_immediate_abort \
+	    --target $@ --release -p canvas-ios
 
 $(XCFRAMEWORK): $(ARCHS_IOS)
 
+# --- Android builds ---
 .PHONY: $(ARCHS_ANDROID)
 $(ARCHS_ANDROID): %:
 	./tools/scripts/build-android.sh $@
 
 .PHONY: GENERATE_ANDROID
 GENERATE_ANDROID: $(ARCHS_ANDROID)
 
-# .PHONY: $(ARCHS_IOS)_SVG
-# $(ARCHS_IOS)_SVG: %_svg:
-# 	./tools/scripts/build-svg-ios.sh $* && ./tools/scripts/copy-svg-ios.sh $*
-
-# .PHONY: GENERATE_IOS_SVG
-# GENERATE_IOS_SVG: $(addsuffix _svg,$(ARCHS_IOS))
+# --- iOS SVG builds ---
+.PHONY: $(addsuffix _svg,$(ARCHS_IOS))
+$(addsuffix _svg,$(ARCHS_IOS)): %_svg:
+	RUSTFLAGS="-Zlocation-detail=none -C panic=abort" \
+	cargo +nightly build -Z build-std='std,panic_abort' \
+	    -Z build-std-features=panic_immediate_abort \
+	    --target $* --release -p canvas-svg-ios
 
-# .PHONY: $(ARCHS_ANDROID)_SVG
-# $(ARCHS_ANDROID)_SVG: %_svg:
-# 	./tools/scripts/build-svg-android.sh $* && ./tools/scripts/copy-svg-android.sh $*
+.PHONY: GENERATE_IOS_SVG
+GENERATE_IOS_SVG: $(addsuffix _svg,$(ARCHS_IOS))
 
-# .PHONY: GENERATE_ANDROID_SVG
-# GENERATE_ANDROID_SVG: $(addsuffix _svg,$(ARCHS_ANDROID))
-
-.PHONY: clean
-clean:
-	rm -rf target
+# --- Android SVG builds ---
+.PHONY: $(addsuffix _svg,$(ARCHS_ANDROID))
+$(addsuffix _svg,$(ARCHS_ANDROID)): %_svg:
+	./tools/scripts/build-svg-android.sh $* svg
 
+.PHONY: GENERATE_ANDROID_SVG
+GENERATE_ANDROID_SVG: $(addsuffix _svg,$(ARCHS_ANDROID))
 
+# --- Debug targets ---
 .PHONY: ios_debug
 ios_debug: $(addsuffix _debug,$(ARCHS_IOS))
 
@@ -64,4 +68,9 @@ $(addsuffix _debug,$(ARCHS_IOS)): %_debug:
 
 .PHONY: $(addsuffix _debug,$(ARCHS_ANDROID))
 $(addsuffix _debug,$(ARCHS_ANDROID)): %_debug:
-	./tools/scripts/build-android.sh $* debug
+	./tools/scripts/build-android.sh $* debug
+
+# --- Clean ---
+.PHONY: clean
+clean:
+	rm -rf target

apps/demo/src/plugin-demos/canvas-media.ts

@@ -1,6 +1,5 @@
 import { Observable, EventData, Page } from '@nativescript/core';
 import { DemoSharedCanvasMedia } from '@demo/shared';
-import {} from '@nativescript/canvas-media';
 
 export function navigatingTo(args: EventData) {
 	const page = <Page>args.object;

apps/demo/src/plugin-demos/canvas-media.xml

@@ -1,19 +1,19 @@
-<Page xmlns="http://schemas.nativescript.org/tns.xsd" xmlns:ui="@nativescript/canvas-media" navigatingTo="navigatingTo"
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" xmlns:ui="@nativescript/canvas-media" xmlns:audio="@nativescript/canvas-media/audio" xmlns:video="@nativescript/canvas-media/video" navigatingTo="navigatingTo"
 			class="page">
 	<Page.actionBar>
 		<ActionBar title="canvas-media" icon="" class="action-bar">
 		</ActionBar>
 	</Page.actionBar>
 	<GridLayout rows="*,*" loaded="{{loaded}}">
-		<!--<ui:Video playsinline="true" height="300">
-			<ui:source src="https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.webm"
+		<video:Video id="video" playsinline="true" autoplay="true" loop="true" height="300">
+			<ui:Source src="https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.webm"
 								 type="video/webm"/>
 
-			<ui:source src="https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.mp4"
+			<ui:Source src="https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.mp4"
 								 type="video/mp4"/>
-		</ui:Video>
+		</video:Video>
 
-		<ui:Audio margin="0 10" controls="true" row="1" playsinline="true" height="300">
+		<!-- <ui:Audio margin="0 10" controls="true" row="1" playsinline="true" height="300">
 			<ui:source src="https://interactive-examples.mdn.mozilla.net/media/cc0-audio/t-rex-roar.mp3"
 								 type="audio/mp3"/>
 		</ui:Audio> -->

crates/canvas-android/build.rs

@@ -6,8 +6,12 @@ use std::path::Path;
 //const DEFAULT_CLANG_VERSION: &str = "14.0.7";
 const DEFAULT_CLANG_VERSION: &str = "12.0.9";
 fn main() {
+    let target_os = env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS not set");
+    if target_os == "android" {
+        println!("cargo:rustc-link-arg=-Wl,-z,max-page-size=16384");
+    }
     setup_aarch64_android_workaround();
-    setup_x86_64_android_workaround();
+
     println!("cargo:rerun-if-changed=src/lib.rs");
     println!("cargo:rerun-if-changed=src/jni_compat/mod.rs");
     println!("cargo:rerun-if-changed=src/jni_compat/org_nativescript_canvas_NSCCanvas.rs");
@@ -16,56 +20,6 @@ fn main() {
     println!("cargo:rerun-if-changed=src/jni_compat/org_nativescript_canvas_NSCSVG.rs");
 }
 
-#[allow(dead_code)]
-fn setup_x86_64_android_workaround() {
-    let target_os = env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS not set");
-    let target_arch = env::var("CARGO_CFG_TARGET_ARCH").expect("CARGO_CFG_TARGET_ARCH not set");
-    if target_arch == "x86_64" && target_os == "android" {
-        println!("cargo:rustc-link-arg=-Wl,-z,max-page-size=16384");
-        /*
-        let android_ndk_home = if let Ok(android_ndk_home) = env::var("ANDROID_NDK") {
-            android_ndk_home
-        } else {
-            env::var("ANDROID_NDK_HOME").expect("ANDROID_NDK_HOME not set")
-        };
-
-        let build_os = match env::consts::OS {
-            "linux" => "linux",
-            "macos" => "darwin",
-            "windows" => "windows",
-            _ => panic!(
-                "Unsupported OS. You must use either Linux, MacOS or Windows to build the crate."
-            ),
-        };
-
-        let ndk_clang_version = if let Ok(mut android_version_txt) = File::open(format!(
-            "{android_ndk_home}/toolchains/llvm/prebuilt/{build_os}-x86_64/AndroidVersion.txt"
-        )) {
-            let mut data = String::new();
-            let _ = android_version_txt.read_to_string(&mut data);
-            let line = data.lines().take(1).next();
-            line.unwrap_or("").to_string()
-        } else {
-            DEFAULT_CLANG_VERSION.to_string()
-        };
-
-        let clang_version = env::var("NDK_CLANG_VERSION").unwrap_or(ndk_clang_version);
-
-        let linux_x86_64_lib_dir = format!(
-            "toolchains/llvm/prebuilt/{build_os}-x86_64/lib64/clang/{clang_version}/lib/linux/"
-        );
-        let linkpath = format!("{android_ndk_home}/{linux_x86_64_lib_dir}");
-        if Path::new(&linkpath).exists() {
-            println!("cargo:rustc-link-search={android_ndk_home}/{linux_x86_64_lib_dir}");
-            println!("cargo:rustc-link-lib=static=clang_rt.builtins-x86_64-android");
-        } else {
-            panic!("Path {linkpath} not exists");
-        }
-
-        */
-    }
-}
-
 fn setup_aarch64_android_workaround() {
     let target_os = env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS not set");
     let target_arch = env::var("CARGO_CFG_TARGET_ARCH").expect("CARGO_CFG_TARGET_ARCH not set");
@@ -93,6 +47,15 @@ fn setup_aarch64_android_workaround() {
             let line = data.lines().take(1).next();
             let mut line = line.unwrap_or("").to_string();
             // in ndk 27 the clang version is 18.0.1 but the directory is named 18 ... let tweak it
+            let ndk_version = android_ndk_home.replace(".", "_").parse::<i64>();
+            if let Ok(ndk_version) = ndk_version {
+                let min_round_version: i64 = 27_0_12077973;
+                if ndk_version >= min_round_version {
+                    if let Some(round_version) = line.split(".").next() {
+                        line = round_version.to_string();
+                    }
+                }
+            }
             if android_ndk_home.contains("27.0.12077973") {
                 line = "18".to_string();
             }
@@ -117,8 +80,6 @@ fn setup_aarch64_android_workaround() {
         let linux_aarch64_lib_dir_other_27_plus =
             format!("toolchains/llvm/prebuilt/{build_os}-x86_64/lib/clang/{version}/lib/linux/");
 
-        println!("cargo:rustc-link-arg=-Wl,-z,max-page-size=16384");
-
         let linkpath_other = format!("{android_ndk_home}/{linux_aarch64_lib_dir_other}");
 
         let linkpath_other_27_plus =

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

@@ -4,10 +4,7 @@ use std::{
 };
 
 use wgpu_core::binding_model::{BindGroupEntry, BufferBinding};
-use wgt::{
-    AddressMode, BindGroupLayoutEntry, BufferBindingType, CompareFunction, FilterMode, QueryType,
-    SamplerBindingType, StorageTextureAccess, TextureFormat, TextureSampleType, VertexFormat,
-};
+use wgt::{AddressMode, BindGroupLayoutEntry, BufferBindingType, CompareFunction, Features, FilterMode, QueryType, SamplerBindingType, StorageTextureAccess, TextureFormat, TextureSampleType, VertexFormat};
 
 use crate::webgpu::gpu_buffer::CanvasGPUBuffer;
 use crate::webgpu::gpu_sampler::CanvasGPUSampler;
@@ -327,6 +324,23 @@ pub enum CanvasGPUTextureFormat {
     /// [`Features::TEXTURE_FORMAT_NV12`] must be enabled to use this texture format.
     NV12,
 
+    /// YUV 4:2:0 chroma subsampled format.
+    ///
+    /// Contains two planes:
+    /// - 0: Single 16 bit channel luminance, of which only the high 10 bits
+    ///   are used.
+    /// - 1: Dual 16 bit channel chrominance at half width and half height, of
+    ///   which only the high 10 bits are used.
+    ///
+    /// Valid view formats for luminance are [`TextureFormat::R16Unorm`].
+    ///
+    /// Valid view formats for chrominance are [`TextureFormat::Rg16Unorm`].
+    ///
+    /// Width and height must be even.
+    ///
+    /// [`Features::TEXTURE_FORMAT_P010`] must be enabled to use this texture format.
+    P010,
+
     // Compressed textures usable with `TEXTURE_COMPRESSION_BC` feature.
     /// 4x4 block compressed texture. 8 bytes per block (4 bit/px). 4 color + alpha pallet. 5 bit R + 6 bit G + 5 bit B + 1 bit alpha.
     /// [0, 63] ([0, 1] for alpha) converted to/from float [0, 1] in shader.
@@ -573,6 +587,7 @@ impl From<wgt::TextureFormat> for CanvasGPUTextureFormat {
                 block: block.into(),
                 channel: channel.into(),
             },
+            TextureFormat::P010 => CanvasGPUTextureFormat::P010
         }
     }
 }
@@ -633,6 +648,7 @@ impl Into<wgt::TextureFormat> for CanvasGPUTextureFormat {
                 wgt::TextureFormat::Depth32FloatStencil8
             }
             CanvasGPUTextureFormat::NV12 => wgt::TextureFormat::NV12,
+            CanvasGPUTextureFormat::P010 => wgt::TextureFormat::P010,
             CanvasGPUTextureFormat::Bc1RgbaUnorm => wgt::TextureFormat::Bc1RgbaUnorm,
             CanvasGPUTextureFormat::Bc1RgbaUnormSrgb => wgt::TextureFormat::Bc1RgbaUnormSrgb,
             CanvasGPUTextureFormat::Bc2RgbaUnorm => wgt::TextureFormat::Bc2RgbaUnorm,
@@ -742,6 +758,7 @@ impl Into<String> for CanvasGPUTextureFormat {
             CanvasGPUTextureFormat::Depth24Plus => "depth24plus",
             CanvasGPUTextureFormat::Depth24PlusStencil8 => "depth24plus-stencil8",
             CanvasGPUTextureFormat::NV12 => "nv12",
+            CanvasGPUTextureFormat::P010 => "p010",
             CanvasGPUTextureFormat::Rgb9e5Ufloat => "rgb9e5ufloat",
             CanvasGPUTextureFormat::Bc1RgbaUnorm => "bc1-rgba-unorm",
             CanvasGPUTextureFormat::Bc1RgbaUnormSrgb => "bc1-rgba-unorm-srgb",
@@ -855,6 +872,7 @@ pub extern "C" fn canvas_native_webgpu_enum_gpu_texture_to_string(
         CanvasGPUTextureFormat::Depth24Plus => "depth24plus",
         CanvasGPUTextureFormat::Depth24PlusStencil8 => "depth24plus-stencil8",
         CanvasGPUTextureFormat::NV12 => "nv12",
+        CanvasGPUTextureFormat::P010 => "p010",
         CanvasGPUTextureFormat::Rgb9e5Ufloat => "rgb9e5ufloat",
         CanvasGPUTextureFormat::Bc1RgbaUnorm => "bc1-rgba-unorm",
         CanvasGPUTextureFormat::Bc1RgbaUnormSrgb => "bc1-rgba-unorm-srgb",

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

@@ -248,11 +248,6 @@ impl From<wgpu_core::command::CreateRenderBundleError> for CanvasGPUError {
     }
 }
 
-impl From<wgpu_core::command::CopyError> for CanvasGPUError {
-    fn from(err: wgpu_core::command::CopyError) -> Self {
-        CanvasGPUError::Validation(fmt_err(&err))
-    }
-}
 
 impl From<wgpu_core::command::CommandEncoderError> for CanvasGPUError {
     fn from(err: wgpu_core::command::CommandEncoderError) -> Self {

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

@@ -262,16 +262,16 @@ fn to_data_url_with_texture(
             depth_or_array_layers: 1,
         };
 
-        let texture_copy = wgt::ImageCopyTexture {
+        let texture_copy = wgt::TexelCopyTextureInfo {
             texture,
             mip_level: 0,
             origin: wgt::Origin3d::ZERO,
             aspect: wgt::TextureAspect::All,
         };
 
-        let buffer_copy = wgt::ImageCopyBuffer {
+        let buffer_copy = wgt::TexelCopyBufferInfo {
             buffer: output_buffer,
-            layout: wgt::ImageDataLayout {
+            layout: wgt::TexelCopyBufferLayout {
                 offset: 0,
                 bytes_per_row: Some(round_up_to_256(4 * width)),
                 rows_per_image: Some(height),
@@ -303,7 +303,7 @@ fn to_data_url_with_texture(
 
         let desc = wgt::CommandBufferDescriptor { label: None };
 
-        let (id, error) = global.command_encoder_finish(encoder, &desc);
+        let (id, error) = global.command_encoder_finish(encoder, &desc, None);
 
         if let Some(_) = error {
             return None;
@@ -1423,14 +1423,14 @@ pub unsafe extern "C" fn canvas_native_webgpu_context_present_surface(
                     depth_or_array_layers: 1,
                 };
 
-                let texture_src_copy = wgpu_core::command::ImageCopyTexture {
+                let texture_src_copy = wgpu_core::command::TexelCopyTextureInfo {
                     texture: texture.texture,
                     mip_level: 0,
                     origin: wgt::Origin3d::ZERO,
                     aspect: wgt::TextureAspect::All,
                 };
 
-                let texture_dst_copy = wgpu_core::command::ImageCopyTexture {
+                let texture_dst_copy = wgpu_core::command::TexelCopyTextureInfo {
                     texture: dst_texture.texture,
                     mip_level: 0,
                     origin: wgt::Origin3d::ZERO,
@@ -1459,7 +1459,7 @@ pub unsafe extern "C" fn canvas_native_webgpu_context_present_surface(
                         Ok(_) => {
                             let desc = wgt::CommandBufferDescriptor { label: None };
 
-                            let (id, error) = global.command_encoder_finish(encoder, &desc);
+                            let (id, error) = global.command_encoder_finish(encoder, &desc, None);
 
                             if error.is_none() {
                                 global.queue_submit(data.device.queue.queue.id, &[id]).ok();