@nativescript/canvas 2.0.0-webgpu.35 → 2.0.0-webgpu.37

package/platforms/ios/src/cpp/ImageAssetImpl.h

@@ -61,6 +61,10 @@ public:
 
     static void FromBytesCb(const v8::FunctionCallbackInfo<v8::Value> &args);
 
+    static void FromEncodedBytesSync(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void FromEncodedBytesCb(const v8::FunctionCallbackInfo<v8::Value> &args);
+
     /* static void SaveSync(const v8::FunctionCallbackInfo<v8::Value> &args);
 
      static void SaveCb(const v8::FunctionCallbackInfo<v8::Value> &args);*/

package/platforms/ios/src/cpp/webgpu/GPUQueueImpl.cpp

@@ -91,7 +91,7 @@ v8::Local<v8::FunctionTemplate> GPUQueueImpl::GetCtor(v8::Isolate *isolate) {
 
 void
 GPUQueueImpl::GetLabel(v8::Local<v8::Name> name,
-                                const v8::PropertyCallbackInfo<v8::Value> &info) {
+                       const v8::PropertyCallbackInfo<v8::Value> &info) {
     auto ptr = GetPointer(info.This());
     if (ptr != nullptr) {
         auto label = canvas_native_webgpu_queue_get_label(ptr->queue_);
@@ -136,7 +136,9 @@ void GPUQueueImpl::CopyExternalImageToTexture(const v8::FunctionCallbackInfo<v8:
         U8Buffer *buffer = nullptr;
         uint32_t width = 0;
         uint32_t height = 0;
-        const ImageAsset* imageAsset = nullptr;
+        const ImageAsset *imageAsset = nullptr;
+        const WebGLState *gl = nullptr;
+        const CanvasRenderingContext2D *c2d = nullptr;
         if (sourceType == NativeType::ImageBitmap) {
             auto bitmap = ImageBitmapImpl::GetPointer(sourceSourceValue.As<v8::Object>());
             imageAsset = bitmap->GetImageAsset();
@@ -149,12 +151,14 @@ void GPUQueueImpl::CopyExternalImageToTexture(const v8::FunctionCallbackInfo<v8:
             width = canvas_native_image_data_get_width(imageData->GetImageData());
             height = canvas_native_image_data_get_height(imageData->GetImageData());
         } else if (sourceType == NativeType::CanvasRenderingContext2D) {
-            auto c2d = CanvasRenderingContext2DImpl::GetPointer(sourceSourceValue.As<v8::Object>());
+            auto ctx = CanvasRenderingContext2DImpl::GetPointer(sourceSourceValue.As<v8::Object>());
+            c2d = ctx->GetContext();
         } else if (sourceType == NativeType::WebGLRenderingContextBase) {
             auto webgl = WebGLRenderingContextBase::GetPointer(sourceSourceValue.As<v8::Object>());
+            gl = webgl->GetState();
         }
 
-        if (buffer == nullptr && imageAsset == nullptr) {
+        if (buffer == nullptr && imageAsset == nullptr && gl == nullptr && c2d == nullptr) {
             // todo error ??
             return;
         }
@@ -260,7 +264,7 @@ void GPUQueueImpl::CopyExternalImageToTexture(const v8::FunctionCallbackInfo<v8:
 
         CanvasExtent3d extent3D = ParseExtent3d(isolate, sizeVal);
 
-        if (imageAsset != nullptr){
+        if (imageAsset != nullptr) {
             CanvasImageCopyImageAsset source{
                     imageAsset,
                     sourceOrigin,
@@ -269,8 +273,37 @@ void GPUQueueImpl::CopyExternalImageToTexture(const v8::FunctionCallbackInfo<v8:
 
 
             canvas_native_webgpu_queue_copy_image_asset_to_texture(ptr->GetGPUQueue(), &source,
-                                                                      &destination,
-                                                                      &extent3D);
+                                                                   &destination,
+                                                                   &extent3D);
+            return;
+        }
+
+
+        if (c2d != nullptr) {
+            CanvasImageCopyCanvasRenderingContext2D source{
+                    c2d,
+                    sourceOrigin,
+                    flipY,
+            };
+
+
+            canvas_native_webgpu_queue_copy_context_to_texture(ptr->GetGPUQueue(), &source,
+                                                               &destination,
+                                                               &extent3D);
+            return;
+        }
+
+        if (gl != nullptr) {
+            CanvasImageCopyWebGL source{
+                    gl,
+                    sourceOrigin,
+                    flipY,
+            };
+
+
+            canvas_native_webgpu_queue_copy_webgl_to_texture(ptr->GetGPUQueue(), &source,
+                                                             &destination,
+                                                             &extent3D);
             return;
         }
 
@@ -279,7 +312,6 @@ void GPUQueueImpl::CopyExternalImageToTexture(const v8::FunctionCallbackInfo<v8:
         auto size = canvas_native_u8_buffer_get_length(buffer);
 
 
-
         if (data == nullptr || size == 0) {
             // todo error
             return;

package/platforms/ios/src/cpp/webgpu/GPURenderPassEncoderImpl.cpp

@@ -79,6 +79,14 @@ v8::Local<v8::FunctionTemplate> GPURenderPassEncoderImpl::GetCtor(v8::Isolate *i
             ConvertToV8String(isolate, "drawIndirect"),
             v8::FunctionTemplate::New(isolate, &DrawIndirect));
 
+    tmpl->Set(
+            ConvertToV8String(isolate, "multiDrawIndexedIndirect"),
+            v8::FunctionTemplate::New(isolate, &MultiDrawIndexedIndirect));
+
+    tmpl->Set(
+            ConvertToV8String(isolate, "multiDrawIndirect"),
+            v8::FunctionTemplate::New(isolate, &MultiDrawIndirect));
+
     tmpl->Set(
             ConvertToV8String(isolate, "end"),
             v8::FunctionTemplate::New(isolate, &End));
@@ -291,6 +299,36 @@ GPURenderPassEncoderImpl::DrawIndexedIndirect(const v8::FunctionCallbackInfo<v8:
     }
 
 
+}
+
+void
+GPURenderPassEncoderImpl::MultiDrawIndexedIndirect(
+        const v8::FunctionCallbackInfo<v8::Value> &args) {
+    auto *ptr = GetPointer(args.This());
+    if (ptr == nullptr) {
+        return;
+    }
+
+    auto isolate = args.GetIsolate();
+    auto context = isolate->GetCurrentContext();
+
+    auto indirectBufferVal = args[0];
+    auto indirectOffsetVal = args[1];
+    auto countVal = args[2];
+
+
+    auto indirectBufferType = GetNativeType(indirectBufferVal);
+
+    if (indirectBufferType == NativeType::GPUBuffer) {
+        auto indirectBuffer = GPUBufferImpl::GetPointer(indirectBufferVal.As<v8::Object>());
+        uint64_t offset = (uint64_t) indirectOffsetVal->NumberValue(context).FromJust();
+        uint32_t count = countVal->Uint32Value(context).FromJust();
+        canvas_native_webgpu_render_pass_encoder_multi_draw_indexed_indirect(ptr->GetPass(),
+                                                                             indirectBuffer->GetGPUBuffer(),
+                                                                             offset, count);
+    }
+
+
 }
 
 void
@@ -318,6 +356,35 @@ GPURenderPassEncoderImpl::DrawIndirect(const v8::FunctionCallbackInfo<v8::Value>
     }
 
 
+}
+
+void
+GPURenderPassEncoderImpl::MultiDrawIndirect(const v8::FunctionCallbackInfo<v8::Value> &args) {
+    auto *ptr = GetPointer(args.This());
+    if (ptr == nullptr) {
+        return;
+    }
+
+    auto isolate = args.GetIsolate();
+    auto context = isolate->GetCurrentContext();
+
+    auto indirectBufferVal = args[0];
+    auto indirectOffsetVal = args[1];
+    auto countVal = args[2];
+
+
+    auto indirectBufferType = GetNativeType(indirectBufferVal);
+
+    if (indirectBufferType == NativeType::GPUBuffer) {
+        auto indirectBuffer = GPUBufferImpl::GetPointer(indirectBufferVal.As<v8::Object>());
+        uint64_t offset = (uint64_t) indirectOffsetVal->NumberValue(context).FromJust();
+        uint32_t count = countVal->Uint32Value(context).FromJust();
+        canvas_native_webgpu_render_pass_encoder_multi_draw_indirect(ptr->GetPass(),
+                                                                     indirectBuffer->GetGPUBuffer(),
+                                                                     offset, count);
+    }
+
+
 }
 
 void GPURenderPassEncoderImpl::End(const v8::FunctionCallbackInfo<v8::Value> &args) {

package/platforms/ios/src/cpp/webgpu/GPURenderPassEncoderImpl.h

@@ -51,6 +51,10 @@ public:
 
     static void DrawIndirect(const v8::FunctionCallbackInfo<v8::Value> &args);
 
+    static void MultiDrawIndexedIndirect(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void MultiDrawIndirect(const v8::FunctionCallbackInfo<v8::Value> &args);
+
     static void End(const v8::FunctionCallbackInfo<v8::Value> &args);
 
     static void EndOcclusionQuery(const v8::FunctionCallbackInfo<v8::Value> &args);

package/utils.d.ts

@@ -4,6 +4,6 @@ export declare class Utils {
     static _CHECKED_FOR_SUPPORT: boolean;
     static toJSArray(array: any): any[];
     static get IS_SUPPORTED_TYPED_ARRAYS_VERSION(): boolean;
-    static isTypedArray(value: any): value is Uint32Array | Uint8Array | Uint8ClampedArray | Int8Array | Uint16Array | Int16Array | Int32Array | Float32Array;
+    static isTypedArray(value: any): value is Uint32Array | Uint8ClampedArray | Uint8Array | Int32Array | Float32Array | Int8Array | Uint16Array | Int16Array;
 }
 export default function lazy<T>(action: () => T): () => T;