chore: webgpu.4

.github/workflows/pull-request.yml

@@ -7,17 +7,14 @@ on:
   pull_request:
   workflow_dispatch:
 
-env:
-  CARGO_TERM_COLOR: always
-
 env:
   NPM_TAG: "pr"
   EMULATOR_NAME: "runtime-emu"
   NDK_VERSION: r23c
   ANDROID_API: 29
   ANDROID_ABI: x86_64
   NDK_ARCH: linux
-
+  CARGO_TERM_COLOR: always
 
 jobs:
   build:

Makefile

@@ -21,7 +21,7 @@ GENERATE_HEADERS:
 # PHONY keyword on make means this is not a file, just an identifier for a target
 .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-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-ios
 
 $(XCFRAMEWORK): $(ARCHS_IOS)
 

crates/canvas-android/build.rs

@@ -7,7 +7,7 @@ use std::path::Path;
 const DEFAULT_CLANG_VERSION: &str = "12.0.9";
 fn main() {
     setup_aarch64_android_workaround();
-    // setup_x86_64_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");
@@ -21,6 +21,8 @@ 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 {
@@ -59,6 +61,8 @@ fn setup_x86_64_android_workaround() {
         } else {
             panic!("Path {linkpath} not exists");
         }
+
+        */
     }
 }
 
@@ -111,6 +115,8 @@ fn setup_aarch64_android_workaround() {
             "toolchains/llvm/prebuilt/{build_os}-x86_64/lib/clang/{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}");
         if Path::new(&linkpath).exists() {
             println!("cargo:rustc-link-search={android_ndk_home}/{linux_aarch64_lib_dir}");

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

@@ -16,5 +16,5 @@ pub extern "C" fn canvas_native_image_filter_release(value: *const ImageFilter)
     if value.is_null() {
         return;
     }
-    let _ = unsafe { Arc::increment_strong_count(value) };
+    let _ = unsafe { Arc::decrement_strong_count(value) };
 }

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

@@ -1,5 +1,10 @@
-use std::sync::Arc;
 use std::{ffi::CStr, os::raw::c_char};
+use std::sync::Arc;
+
+use crate::webgpu::error::handle_error;
+use crate::webgpu::prelude::ptr_into_label;
+use crate::webgpu::structs::{CanvasLoadOp, CanvasStoreOp};
+
 //use wgpu_core::gfx_select;
 use super::{
     enums::CanvasTextureAspect,
@@ -15,9 +20,6 @@ use super::{
         CanvasRenderPassDepthStencilAttachment,
     },
 };
-use crate::webgpu::error::handle_error;
-use crate::webgpu::prelude::ptr_into_label;
-use crate::webgpu::structs::{CanvasLoadOp, CanvasStoreOp};
 
 pub struct CanvasGPUCommandEncoder {
     pub(crate) instance: Arc<CanvasWebGPUInstance>,

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

@@ -1,4 +1,5 @@
 use std::sync::Arc;
+
 //use wgpu_core::gfx_select;
 use crate::webgpu::error::handle_error;
 use crate::webgpu::gpu::CanvasWebGPUInstance;
@@ -10,13 +11,24 @@ pub struct CanvasGPUComputePipeline {
     pub(crate) error_sink: super::gpu_device::ErrorSink,
 }
 
+impl Drop for CanvasGPUComputePipeline {
+    fn drop(&mut self) {
+        if !std::thread::panicking() {
+            let global = self.instance.global();
+            gfx_select!(id => global.compute_pipeline_drop(self.pipeline));
+        }
+    }
+}
+
+
 #[no_mangle]
 pub unsafe extern "C" fn canvas_native_webgpu_compute_pipeline_reference(
     pipeline: *const CanvasGPUComputePipeline,
 ) {
     if pipeline.is_null() {
         return;
     }
+
     Arc::increment_strong_count(pipeline);
 }
 

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

@@ -7,6 +7,15 @@ pub struct CanvasGPUPipelineLayout {
     pub(crate) layout: wgpu_core::id::PipelineLayoutId,
 }
 
+impl Drop for CanvasGPUPipelineLayout {
+    fn drop(&mut self) {
+        if !std::thread::panicking() {
+            let global = self.instance.global();
+            gfx_select!(layout => global.pipeline_layout_drop(self.layout));
+        }
+    }
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn canvas_native_webgpu_pipeline_layout_reference(
     pipeline_layout: *const CanvasGPUPipelineLayout,

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

@@ -1,5 +1,6 @@
 use std::os::raw::{c_char, c_void};
 use std::sync::Arc;
+
 //use wgpu_core::gfx_select;
 use crate::webgpu::error::{handle_error, handle_error_fatal};
 
@@ -217,6 +218,10 @@ pub unsafe extern "C" fn canvas_native_webgpu_queue_submit(
     {
         handle_error_fatal(global, cause, "canvas_native_webgpu_queue_submit");
     }
+
+    for id in command_buffer_ids.into_iter() {
+        gfx_select!(id => global.command_buffer_drop(id));
+    }
 }
 
 #[no_mangle]

crates/playground/src/main.rs

@@ -199,7 +199,7 @@ fn test(state: &mut WebGLState, gl_state: &mut WebGLState, ctx_2d: &mut CanvasRe
     // state.remove_if_current();
     gl_state.make_current();
 
-    let mut ctx = ctx_2d.get_context_mut();;
+    let mut ctx = ctx_2d.get_context_mut();
 
     ctx.set_font("30px Arial");
 

nx.json

@@ -21,17 +21,11 @@
 			"inputs": ["production", "^production"],
 			"cache": true
 		},
-		"lint": {
-			"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
-			"cache": true
-		},
 		"build.all": {
 			"cache": true
 		},
-		"test": {
-			"cache": true
-		},
-		"e2e": {
+		"@nx/eslint:lint": {
+			"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
 			"cache": true
 		}
 	},

packages/canvas-babylon/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-babylon",
-	"version": "2.0.0-webgpu.2",
+	"version": "2.0.0-webgpu.4",
 	"description": "",
 	"main": "index",
 	"typings": "index.d.ts",

packages/canvas-media/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-media",
-	"version": "2.0.0-webgpu.2",
+	"version": "2.0.0-webgpu.4",
 	"description": "Canvas media",
 	"main": "index",
 	"typings": "index.d.ts",

packages/canvas-phaser-ce/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-phaser-ce",
-	"version": "2.0.0-webgpu.2",
+	"version": "2.0.0-webgpu.4",
 	"description": "Tools for using Phaser-ce to build native 2D games in NativeScript 👾",
 	"main": "index",
 	"typings": "index.d.ts",

packages/canvas-phaser/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-phaser",
-	"version": "2.0.0-webgpu.2",
+	"version": "2.0.0-webgpu.4",
 	"description": "Build awesome 2D games with Phaser.js and NativeScript",
 	"main": "index",
 	"typings": "index.d.ts",

packages/canvas-pixi/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-pixi",
-	"version": "2.0.0-webgpu.2",
+	"version": "2.0.0-webgpu.4",
 	"description": "Plugin for using pixi.js in NativeScript",
 	"main": "index",
 	"typings": "index.d.ts",

packages/canvas-polyfill/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-polyfill",
-	"version": "2.0.0-webgpu.2",
+	"version": "2.0.0-webgpu.4",
 	"description": "Polyfill for making NativeScript compatible with web libs like pixi.js, three.js, phaser.js, babylon.js, etc....",
 	"main": "index",
 	"typings": "index.d.ts",

packages/canvas-svg/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-svg",
-	"version": "2.0.0-webgpu.2",
+	"version": "2.0.0-webgpu.4",
 	"description": "Add a plugin description",
 	"main": "index",
 	"typings": "index.d.ts",