feat: webgpu.33

NativeScript · Oct 14, 2024 · 3d85c04 · 3d85c04
1 parent d6a5cbd
commit 3d85c04
Show file tree

Hide file tree

Showing 30 changed files with 164 additions and 250 deletions.
diff --git a/apps/demo/src/app.ts b/apps/demo/src/app.ts
@@ -3,13 +3,16 @@ Helpers.initialize();
 require('@nativescript/canvas-polyfill');
 */
 import '@nativescript/canvas-polyfill';
+import { Canvas } from '@nativescript/canvas';
 // require('@nativescript/canvas-polyfill');
 // import { Svg } from '@nativescript/canvas-svg';
 // import { ImageAsset } from '@nativescript/canvas';
 declare const jp, GDPerformanceMonitor, android, java, UIColor;
 let monitor;
 import { Application, path as filePath, knownFolders, Utils, path as nsPath, ImageSource, Trace, Screen } from '@nativescript/core';
 
+// Canvas.useSurface = true;
+Canvas.forceGL = false;
 Application.on('discardedError', (args) => {
 	console.log('discardedError', args.error, args);
 });

diff --git a/crates/canvas-2d/src/context/surface_vulkan.rs b/crates/canvas-2d/src/context/surface_vulkan.rs
@@ -85,7 +85,7 @@ impl Context {
                 image.unwrap() as gpu::vk::Image,
                 alloc,
                 gpu::vk::ImageTiling::OPTIMAL,
-                gpu::vk::ImageLayout::COLOR_ATTACHMENT_OPTIMAL,
+                gpu::vk::ImageLayout::UNDEFINED,
                 gpu::vk::Format::R8G8B8A8_UNORM,
                 1,
                 None,
@@ -186,7 +186,7 @@ impl Context {
                     image.unwrap() as gpu::vk::Image,
                     alloc,
                     gpu::vk::ImageTiling::OPTIMAL,
-                    gpu::vk::ImageLayout::COLOR_ATTACHMENT_OPTIMAL,
+                    gpu::vk::ImageLayout::UNDEFINED,
                     gpu::vk::Format::R8G8B8A8_UNORM,
                     1,
                     None,

diff --git a/crates/canvas-android/src/jni_compat/org_nativescript_canvas_NSCCanvas.rs b/crates/canvas-android/src/jni_compat/org_nativescript_canvas_NSCCanvas.rs
@@ -272,6 +272,8 @@ pub extern "system" fn nativeUpdate2DSurface(
     env: JNIEnv,
     _: JClass,
     surface: jobject,
+    width: jint,
+    height: jint,
     context: jlong,
 ) {
     if context == 0 {
@@ -282,8 +284,8 @@ pub extern "system" fn nativeUpdate2DSurface(
 
     unsafe {
         if let Some(window) = NativeWindow::from_surface(env.get_native_interface(), surface) {
-            let width = window.width() as f32;
-            let height = window.height() as f32;
+            let width = width as f32;
+            let height = height as f32;
 
             #[cfg(feature = "gl")]{
                 let context = context.get_context_mut();

diff --git a/crates/canvas-android/src/lib.rs b/crates/canvas-android/src/lib.rs
@@ -101,7 +101,7 @@ pub extern "system" fn JNI_OnLoad(vm: JavaVM, _reserved: *const c_void) -> jint
                     "(IIZZZZIZZZZZI)J",
                     "(Landroid/view/Surface;ZFIFI)J",
                     "(Landroid/view/Surface;J)V",
-                    "(Landroid/view/Surface;J)V",
+                    "(Landroid/view/Surface;IIJ)V",
                     "(IIJ)V",
                     "(IIJ)V",
                     "(J)V",
@@ -129,7 +129,7 @@ pub extern "system" fn JNI_OnLoad(vm: JavaVM, _reserved: *const c_void) -> jint
                     "!(IIZZZZIZZZZZI)J",
                     "!(Landroid/view/Surface;ZFIFI)J",
                     "!(Landroid/view/Surface;J)V",
-                    "!(Landroid/view/Surface;J)V",
+                    "!(Landroid/view/Surface;IIJ)V",
                     "!(IIJ)V",
                     "!(IIJ)V",
                     "!(J)V",

diff --git a/crates/canvas-c/src/c2d/context.rs b/crates/canvas-c/src/c2d/context.rs
@@ -216,15 +216,9 @@ impl CanvasRenderingContext2D {
             context.swap_buffers();
         }
 
-        #[cfg(feature = "vulkan")]
-        if let Some(vulkan) = self.context.vulkan_context.as_mut() {
-            vulkan.record_command_buffer();
-        }
-
         #[cfg(feature = "vulkan")]
         if self.engine == Engine::Vulkan {
-            self.context.
-                submit();
+            self.context.flush()
         }
 
         #[cfg(feature = "vulkan")]