@nativescript/canvas 2.0.0-rc.2 → 2.0.0-rc.21

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

@@ -200,6 +200,7 @@ void GPUQueueImpl::CopyExternalImageToTexture(const v8::FunctionCallbackInfo<v8:
                                                                          "texture")).ToLocalChecked();
         auto texture = GPUTextureImpl::GetPointer(textureVal.As<v8::Object>())->GetTexture();
 
+
         uint32_t mipLevel = 0;
         CanvasOrigin3d origin{0, 0, 0};
         CanvasTextureAspect aspect = CanvasTextureAspectAll;
@@ -441,31 +442,57 @@ void GPUQueueImpl::WriteBuffer(const v8::FunctionCallbackInfo<v8::Value> &args)
         auto buffer = GPUBufferImpl::GetPointer(bufferValue.As<v8::Object>());
 
         auto bufferOffset = (uint64_t) args[1].As<v8::Number>()->Value();
-
-        auto dataValue = args[2].As<v8::TypedArray>();
-
-        auto offset = dataValue->ByteOffset();
-
-        auto store = dataValue->Buffer()->GetBackingStore();
-
-        auto data = static_cast<uint8_t *>(store->Data()) + offset;
-
-        auto data_size = store->ByteLength() - offset;
+			
+				std::shared_ptr<v8::BackingStore> store;
+			
+				uint8_t * data = nullptr;
+				
+				size_t offset = 0;
+				size_t data_size = 0;
+			
+			if(args[2]->IsTypedArray()){
+				auto dataValue = args[2].As<v8::TypedArray>();
+				store = dataValue->Buffer()->GetBackingStore();
+				offset = dataValue->ByteOffset();
+				data = static_cast<uint8_t *>(store->Data()) + offset;
+				data_size = store->ByteLength() - offset;
+			}else if(args[2]->IsArrayBuffer()){
+				auto dataValue = args[2].As<v8::ArrayBuffer>();
+				store = dataValue->GetBackingStore();
+				data = static_cast<uint8_t *>(store->Data());
+				data_size = store->ByteLength();
+			}else {
+				return;
+			}
+
+      
 
         auto dataOffset = (uint64_t) args[3].As<v8::Number>()->Value();
 
-        int64_t size = -1;
         auto sizeValue = args[4];
 
-        if (sizeValue->IsNumber()) {
-            size = (int64_t) sizeValue->ToNumber(context).ToLocalChecked()->Value();
-        }
-
 
         if (buffer != nullptr) {
-            canvas_native_webgpu_queue_write_buffer(ptr->GetGPUQueue(), buffer->GetGPUBuffer(),
-                                                    bufferOffset, data, data_size, dataOffset,
-                                                    size);
+
+
+            if (sizeValue->IsNumber()) {
+                int64_t size = (int64_t) sizeValue->ToNumber(context).ToLocalChecked()->Value();
+								
+							if(size < 0){
+								canvas_native_webgpu_queue_write_buffer(ptr->GetGPUQueue(), buffer->GetGPUBuffer(),
+																												bufferOffset, data, data_size, dataOffset);
+							}else {
+								canvas_native_webgpu_queue_write_buffer_size(ptr->GetGPUQueue(),
+																														 buffer->GetGPUBuffer(),
+																														 bufferOffset, data, data_size,
+																														 dataOffset,
+																														 size);
+							}
+              
+            } else {
+                canvas_native_webgpu_queue_write_buffer(ptr->GetGPUQueue(), buffer->GetGPUBuffer(),
+                                                        bufferOffset, data, data_size, dataOffset);
+            }
         }
     }
 

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

@@ -586,8 +586,10 @@ void GPURenderPassEncoderImpl::SetBlendConstant(const v8::FunctionCallbackInfo<v
 
         auto color = ParseColor(isolate, colorVal);
 
-
-        canvas_native_webgpu_render_pass_encoder_set_blend_constant(ptr->GetPass(), &color);
+        if (color.tag == CanvasOptionalColorSome) {
+            canvas_native_webgpu_render_pass_encoder_set_blend_constant(ptr->GetPass(),
+                                                                        &color.some);
+        }
     }
 
 }
@@ -702,22 +704,23 @@ void GPURenderPassEncoderImpl::SetViewport(const v8::FunctionCallbackInfo<v8::Va
 
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
-    
-    
-   auto x = (float) xVal->NumberValue(
-                                   context).FromJust();
-                                                          auto y = (float) yVal->NumberValue(
-                                                                                          context).FromJust();
-                                                          auto width = (float) widthVal->NumberValue(
-                                                                                                  context).FromJust();
-                                                          auto height = (float) heightVal->NumberValue(
-                                                                                                    context).FromJust();
-    
-                                                          auto minDepth = (float) minDepthVal->NumberValue(
-                                                                                                        context).FromJust();
-                                                          auto maxDepth = (float) maxDepthVal->NumberValue(
-                                                                                                        context).FromJust();
-
-    canvas_native_webgpu_render_pass_encoder_set_viewport(ptr->GetPass(),x,y,width,height, minDepth, maxDepth);
+
+
+    auto x = (float) xVal->NumberValue(
+            context).FromJust();
+    auto y = (float) yVal->NumberValue(
+            context).FromJust();
+    auto width = (float) widthVal->NumberValue(
+            context).FromJust();
+    auto height = (float) heightVal->NumberValue(
+            context).FromJust();
+
+    auto minDepth = (float) minDepthVal->NumberValue(
+            context).FromJust();
+    auto maxDepth = (float) maxDepthVal->NumberValue(
+            context).FromJust();
+
+    canvas_native_webgpu_render_pass_encoder_set_viewport(ptr->GetPass(), x, y, width, height,
+                                                          minDepth, maxDepth);
 
 }

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

@@ -4,6 +4,7 @@
 
 #include "GPUShaderModuleImpl.h"
 #include "Caches.h"
+#include "GPUCompilationInfoImpl.h"
 
 GPUShaderModuleImpl::GPUShaderModuleImpl(const CanvasGPUShaderModule *shaderModule) : shaderModule_(
         shaderModule) {}
@@ -52,6 +53,10 @@ v8::Local<v8::FunctionTemplate> GPUShaderModuleImpl::GetCtor(v8::Isolate *isolat
             GetLabel
     );
 
+    tmpl->Set(
+            ConvertToV8String(isolate, "getCompilationInfo"),
+            v8::FunctionTemplate::New(isolate, &GetCompilationInfo));
+
     cache->GPUShaderModuleTmpl =
             std::make_unique<v8::Persistent<v8::FunctionTemplate>>(isolate, ctorTmpl);
     return ctorTmpl;
@@ -77,4 +82,22 @@ GPUShaderModuleImpl::GetLabel(v8::Local<v8::Name> name,
     info.GetReturnValue().SetEmptyString();
 }
 
+void
+GPUShaderModuleImpl::GetCompilationInfo(const v8::FunctionCallbackInfo<v8::Value> &args) {
+    auto isolate = args.GetIsolate();
+    auto context = isolate->GetCurrentContext();
+    GPUShaderModuleImpl *ptr = GetPointer(args.This());
+    auto resolver = v8::Promise::Resolver::New(isolate->GetCurrentContext()).ToLocalChecked();
+    args.GetReturnValue().Set(resolver->GetPromise());
+    if (ptr == nullptr) {
+        resolver->Reject(context, v8::Null(isolate));
+        return;
+    }
+
+    auto info = new GPUCompilationInfoImpl(
+            canvas_native_webgpu_device_create_shader_module_get_compilation_info(
+                    ptr->GetShaderModule()));
+
+    resolver->Resolve(context, GPUCompilationInfoImpl::NewInstance(isolate, info));
+}
 

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

@@ -40,6 +40,8 @@ public:
     static void GetLabel(v8::Local<v8::Name> name,
                          const v8::PropertyCallbackInfo<v8::Value> &info);
 
+    static void GetCompilationInfo(const v8::FunctionCallbackInfo<v8::Value> &args);
+
 private:
     const CanvasGPUShaderModule *shaderModule_;
 };

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

@@ -364,6 +364,17 @@ void GPUTextureImpl::CreateView(const v8::FunctionCallbackInfo<v8::Value> &args)
             }
         }
 
+
+        v8::Local<v8::Value> usageVal;
+        uint32_t usage = 0;
+        if (descObj->Get(context, ConvertToV8String(isolate, "usage")).ToLocal(
+                &usageVal) && usageVal->IsUint32()) {
+            usage = usageVal->Uint32Value(context).FromJust();
+        }
+
+        descriptor->usage = usage;
+
+
         descriptor->dimension = dimension;
 
 

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

@@ -13,9 +13,9 @@
 #include "GPUBufferImpl.h"
 
 inline static CanvasStoreOp
-ParseCanvasStoreOp(v8::Isolate *isolate, const v8::Local<v8::Value> &obj){
+ParseCanvasStoreOp(v8::Isolate *isolate, const v8::Local<v8::Value> &obj) {
     auto ret = CanvasStoreOp::CanvasStoreOpStore;
-    if(!obj.IsEmpty()){
+    if (!obj.IsEmpty()) {
         if (obj->IsUint32()) {
             ret = (CanvasStoreOp) obj->Uint32Value(isolate->GetCurrentContext()).ToChecked();
         } else if (obj->IsString()) {
@@ -31,9 +31,9 @@ ParseCanvasStoreOp(v8::Isolate *isolate, const v8::Local<v8::Value> &obj){
 }
 
 inline static CanvasLoadOp
-ParseCanvasLoadOp(v8::Isolate *isolate, const v8::Local<v8::Value> &obj){
+ParseCanvasLoadOp(v8::Isolate *isolate, const v8::Local<v8::Value> &obj) {
     auto ret = CanvasLoadOp::CanvasLoadOpClear;
-    if(!obj.IsEmpty()){
+    if (!obj.IsEmpty()) {
         if (obj->IsUint32()) {
             ret = (CanvasLoadOp) obj->Uint32Value(isolate->GetCurrentContext()).ToChecked();
         } else if (obj->IsString()) {
@@ -687,65 +687,75 @@ ParseExtent3d(v8::Isolate *isolate, const v8::Local<v8::Value> &obj) {
 }
 
 
-inline static CanvasColor
+inline static CanvasOptionalColor
 ParseColor(v8::Isolate *isolate, const v8::Local<v8::Value> &obj) {
 
     auto context = isolate->GetCurrentContext();
-    CanvasColor ret{
-            0, 0, 0, 0
+    CanvasOptionalColor ret{
+            CanvasOptionalColorNone
     };
 
     if (!obj.IsEmpty()) {
         if (obj->IsArray()) {
             auto array = obj.As<v8::Array>();
             v8::Local<v8::Value> r;
+            ret.tag = CanvasOptionalColorSome;
+            ret.some = CanvasColor{
+                    0, 0, 0, 0
+            };
             if (array->Get(context, 0).ToLocal(&r) &&
                 r->IsNumber()) {
-                ret.r = r->NumberValue(context).FromJust();
+                ret.some.r = r->NumberValue(context).FromJust();
             }
 
             v8::Local<v8::Value> g;
             if (array->Get(context, 1).ToLocal(&g) &&
                 g->IsNumber()) {
-                ret.g = g->NumberValue(context).FromJust();
+                ret.some.g = g->NumberValue(context).FromJust();
             }
 
             v8::Local<v8::Value> b;
             if (array->Get(context, 2).ToLocal(
                     &b) && b->IsNumber()) {
-                ret.b = b->NumberValue(context).FromJust();
+                ret.some.b = b->NumberValue(context).FromJust();
             }
 
 
             v8::Local<v8::Value> a;
             if (array->Get(context, 3).ToLocal(
                     &a) && a->IsNumber()) {
-                ret.a = a->NumberValue(context).FromJust();
+                ret.some.a = a->NumberValue(context).FromJust();
             }
         } else if (obj->IsObject()) {
             auto colorObj = obj.As<v8::Object>();
             v8::Local<v8::Value> r;
+
+            ret.tag = CanvasOptionalColorSome;
+            ret.some = CanvasColor{
+                    0, 0, 0, 0
+            };
+
             if (colorObj->Get(context, ConvertToV8String(isolate, "r")).ToLocal(&r) &&
                 r->IsNumber()) {
-                ret.r = r->NumberValue(context).FromJust();
+                ret.some.r = r->NumberValue(context).FromJust();
             }
 
             v8::Local<v8::Value> g;
             if (colorObj->Get(context, ConvertToV8String(isolate, "g")).ToLocal(&g) &&
                 g->IsNumber()) {
-                ret.g = g->NumberValue(context).FromJust();
+                ret.some.g = g->NumberValue(context).FromJust();
             }
 
             v8::Local<v8::Value> b;
             if (colorObj->Get(context, ConvertToV8String(isolate, "b")).ToLocal(
                     &b) && b->IsNumber()) {
-                ret.b = b->NumberValue(context).FromJust();
+                ret.some.b = b->NumberValue(context).FromJust();
             }
 
             v8::Local<v8::Value> a;
             if (colorObj->Get(context, ConvertToV8String(isolate, "a")).ToLocal(
                     &a) && a->IsNumber()) {
-                ret.a = a->NumberValue(context).FromJust();
+                ret.some.a = a->NumberValue(context).FromJust();
             }
         }
     }

package/angular/esm2022/index.mjs

@@ -1,17 +0,0 @@
-import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
-import { registerElement } from '@nativescript/angular';
-import * as i0 from "@angular/core";
-registerElement('Canvas', () => require('@nativescript/canvas').Canvas);
-// @ts-ignore
-export class CanvasModule {
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.11", ngImport: i0, type: CanvasModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-    static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "18.2.11", ngImport: i0, type: CanvasModule });
-    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.2.11", ngImport: i0, type: CanvasModule });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.11", ngImport: i0, type: CanvasModule, decorators: [{
-            type: NgModule,
-            args: [{
-                    schemas: [NO_ERRORS_SCHEMA]
-                }]
-        }] });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jYW52YXMvYW5ndWxhci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUMsUUFBUSxFQUFFLGdCQUFnQixFQUFDLE1BQU0sZUFBZSxDQUFDO0FBQ3pELE9BQU8sRUFBQyxlQUFlLEVBQUMsTUFBTSx1QkFBdUIsQ0FBQzs7QUFFdEQsZUFBZSxDQUFDLFFBQVEsRUFBRSxHQUFHLEVBQUUsQ0FBQyxPQUFPLENBQUMsc0JBQXNCLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQztBQU14RSxhQUFhO0FBQ2IsTUFBTSxPQUFPLFlBQVk7d0dBQVosWUFBWTt5R0FBWixZQUFZO3lHQUFaLFlBQVk7OzRGQUFaLFlBQVk7a0JBSnhCLFFBQVE7bUJBQUM7b0JBQ1IsT0FBTyxFQUFFLENBQUMsZ0JBQWdCLENBQUM7aUJBQzVCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtOZ01vZHVsZSwgTk9fRVJST1JTX1NDSEVNQX0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQge3JlZ2lzdGVyRWxlbWVudH0gZnJvbSAnQG5hdGl2ZXNjcmlwdC9hbmd1bGFyJztcblxucmVnaXN0ZXJFbGVtZW50KCdDYW52YXMnLCAoKSA9PiByZXF1aXJlKCdAbmF0aXZlc2NyaXB0L2NhbnZhcycpLkNhbnZhcyk7XG5cblxuQE5nTW9kdWxlKHtcbiAgc2NoZW1hczogW05PX0VSUk9SU19TQ0hFTUFdXG59KVxuLy8gQHRzLWlnbm9yZVxuZXhwb3J0IGNsYXNzIENhbnZhc01vZHVsZSB7XG59XG4iXX0=

package/angular/esm2022/nativescript-canvas-angular.mjs

@@ -1,5 +0,0 @@
-/**
- * Generated bundle index. Do not edit.
- */
-export * from './index';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmF0aXZlc2NyaXB0LWNhbnZhcy1hbmd1bGFyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY2FudmFzL2FuZ3VsYXIvbmF0aXZlc2NyaXB0LWNhbnZhcy1hbmd1bGFyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBRUgsY0FBYyxTQUFTLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEdlbmVyYXRlZCBidW5kbGUgaW5kZXguIERvIG5vdCBlZGl0LlxuICovXG5cbmV4cG9ydCAqIGZyb20gJy4vaW5kZXgnO1xuIl19