@nativescript/canvas 2.0.0-webgpu.1 → 2.0.0-webgpu.2

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

@@ -100,7 +100,7 @@ GPUAdapterImpl::GetFeatures(v8::Local<v8::Name> name,
             }
 
         }
-        canvas_native_string_buffer_destroy(features);
+        canvas_native_string_buffer_release(features);
 
         info.GetReturnValue().Set(map);
 

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

@@ -270,7 +270,7 @@ void GPUCanvasContextImpl::GetCapabilities(const v8::FunctionCallbackInfo<v8::Va
             auto formats = v8::Array::New(isolate, (int) formats_len);
             for (int i = 0; i < formats_len; i++) {
                 auto format = canvas_native_string_buffer_get_value_at(cap->formats, i);
-                formats->Set(context, i, ConvertToV8String(isolate, format));
+                formats->Set(context, i, ConvertToV8String(isolate, format)).FromJust();
                 canvas_native_string_destroy(format);
             }
 
@@ -280,7 +280,7 @@ void GPUCanvasContextImpl::GetCapabilities(const v8::FunctionCallbackInfo<v8::Va
 
             for (int i = 0; i < present_modes_len; i++) {
                 auto mode = canvas_native_string_buffer_get_value_at(cap->present_modes, i);
-                present_modes->Set(context, i, ConvertToV8String(isolate, mode));
+                present_modes->Set(context, i, ConvertToV8String(isolate, mode)).FromJust();
                 canvas_native_string_destroy(mode);
             }
 
@@ -290,15 +290,15 @@ void GPUCanvasContextImpl::GetCapabilities(const v8::FunctionCallbackInfo<v8::Va
 
             for (int i = 0; i < alpha_modes_len; i++) {
                 auto mode = canvas_native_string_buffer_get_value_at(cap->alpha_modes, i);
-                alpha_modes->Set(context, i, ConvertToV8String(isolate, mode));
+                alpha_modes->Set(context, i, ConvertToV8String(isolate, mode)).FromJust();
                 canvas_native_string_destroy(mode);
             }
 
-            ret->Set(context, ConvertToV8String(isolate, "format"), formats);
-            ret->Set(context, ConvertToV8String(isolate, "presentModes"), present_modes);
-            ret->Set(context, ConvertToV8String(isolate, "alphaModes"), alpha_modes);
+            ret->Set(context, ConvertToV8String(isolate, "format"), formats).FromJust();
+            ret->Set(context, ConvertToV8String(isolate, "presentModes"), present_modes).FromJust();
+            ret->Set(context, ConvertToV8String(isolate, "alphaModes"), alpha_modes).FromJust();
             ret->Set(context, ConvertToV8String(isolate, "usages"),
-                     v8::Uint32::NewFromUnsigned(isolate, cap->usages));
+                     v8::Uint32::NewFromUnsigned(isolate, cap->usages)).FromJust();
 
             canvas_native_webgpu_struct_surface_capabilities_release(cap);
 
@@ -309,9 +309,9 @@ void GPUCanvasContextImpl::GetCapabilities(const v8::FunctionCallbackInfo<v8::Va
 
     }
 
-    ret->Set(context, ConvertToV8String(isolate, "format"), v8::Array::New(isolate));
-    ret->Set(context, ConvertToV8String(isolate, "presentModes"), v8::Array::New(isolate));
-    ret->Set(context, ConvertToV8String(isolate, "alphaModes"), v8::Array::New(isolate));
-    ret->Set(context, ConvertToV8String(isolate, "usages"), v8::Uint32::New(isolate, 0));
+    ret->Set(context, ConvertToV8String(isolate, "format"), v8::Array::New(isolate)).FromJust();
+    ret->Set(context, ConvertToV8String(isolate, "presentModes"), v8::Array::New(isolate)).FromJust();
+    ret->Set(context, ConvertToV8String(isolate, "alphaModes"), v8::Array::New(isolate)).FromJust();
+    ret->Set(context, ConvertToV8String(isolate, "usages"), v8::Uint32::New(isolate, 0)).FromJust();
     args.GetReturnValue().Set(ret);
 }

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

@@ -248,13 +248,13 @@ GPUDeviceImpl::GetFeatures(v8::Local<v8::Name> name,
         for (int i = 0; i < len; ++i) {
             auto item = canvas_native_string_buffer_get_value_at(features, i);
             if (item != nullptr) {
-                auto keyValue = ConvertToV8OneByteString(isolate, (char *) item);
+                auto keyValue = ConvertToV8String(isolate, (char *) item);
                 map->Set(context, keyValue, keyValue);
                 canvas_native_string_destroy(item);
             }
 
         }
-        canvas_native_string_buffer_destroy(features);
+        canvas_native_string_buffer_release(features);
 
         info.GetReturnValue().Set(map);
 
@@ -377,7 +377,7 @@ void GPUDeviceImpl::CreateBindGroup(const v8::FunctionCallbackInfo<v8::Value> &a
     char *label = nullptr;
 
     auto optionsVal = args[0];
-    
+
     std::vector<CanvasBindGroupEntry> entries;
 
     if (optionsVal->IsObject()) {
@@ -467,7 +467,7 @@ void GPUDeviceImpl::CreateBindGroup(const v8::FunctionCallbackInfo<v8::Value> &a
                                         int64_t offset = -1;
 
                                         v8::Local<v8::Value> offsetVal;
-                                        
+
                                         resourceObj->Get(context,
                                                        ConvertToV8String(isolate,
                                                                          "offset")).ToLocal(
@@ -1234,7 +1234,6 @@ void GPUDeviceImpl::CreateQuerySet(const v8::FunctionCallbackInfo<v8::Value> &ar
         label = *v8::String::Utf8Value(isolate, labelVal);
     }
 
-
     v8::Local<v8::Value> typeVal;
     options->Get(context, ConvertToV8String(isolate, "type")).ToLocal(&labelVal);
 
@@ -1573,7 +1572,7 @@ void GPUDeviceImpl::CreateRenderPipeline(const v8::FunctionCallbackInfo<v8::Valu
         if (!stencilWriteMaskVal.IsEmpty() && stencilWriteMaskVal->IsUint32()) {
             stencil->stencil_write_mask = stencilWriteMaskVal->Uint32Value(context).FromJust();
         }
-        
+
         descriptor.depth_stencil = stencil;
 
     }
@@ -2262,7 +2261,7 @@ void GPUDeviceImpl::CreateRenderPipeline(const v8::FunctionCallbackInfo<v8::Valu
         }
 
     }
-    
+
     if(descriptor.depth_stencil != nullptr){
         delete descriptor.depth_stencil;
     }

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

@@ -11,7 +11,7 @@
 
 class GPUDeviceImpl : ObjectWrapperImpl {
 public:
-    GPUDeviceImpl(const CanvasGPUDevice *device);
+    explicit GPUDeviceImpl(const CanvasGPUDevice *device);
 
     ~GPUDeviceImpl() {
         canvas_native_webgpu_device_release(this->device_);

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

@@ -180,7 +180,7 @@ void GPUImpl::__GetPointer(const v8::FunctionCallbackInfo<v8::Value> &args) {
 
     auto isolate = args.GetIsolate();
 
-    auto pointer = (intptr_t *) ptr->GetGPUInstance();
-    auto ret = std::to_string((intptr_t) pointer);
+    auto pointer = canvas_native_webgpu_get_pointer_addr(ptr->GetGPUInstance());
+    auto ret = std::to_string(pointer);
     args.GetReturnValue().Set(ConvertToV8String(isolate, ret));
 }

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

@@ -228,9 +228,10 @@ void GPURenderPassEncoderImpl::DrawIndexed(const v8::FunctionCallbackInfo<v8::Va
             firstInstance = firstInstanceVal.As<v8::Uint32>()->Value();
         }
 
+        auto indexCount = indexCountVal->Uint32Value(
+                                                     context).FromJust();
         canvas_native_webgpu_render_pass_encoder_draw_indexed(ptr->GetPass(),
-                                                              indexCountVal->Uint32Value(
-                                                                      context).FromJust(),
+                                                              indexCount,
                                                               instanceCount, firstIndex,
                                                               baseVertex,
                                                               firstInstance);

package/react/index.d.ts

@@ -13,7 +13,7 @@ export declare type CanvasAttributes = ViewAttributes & {
     onReady?: (arg: EventData) => void;
 };
 declare global {
-    module JSX {
+    namespace JSX {
         interface IntrinsicElements {
             tnsCanvas: NativeScriptProps<CanvasAttributes, Canvas>;
         }

package/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../packages/canvas/utils.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,KAAK;IAIV,MAAM,CAAC,SAAS,CAAC,KAAK;QAC5B,IAAI,MAAM,CAAC,KAAK,EAAE;YACjB,IAAI,KAAK,YAAY,OAAO,EAAE;gBAC7B,MAAM,OAAO,GAAG,EAAE,CAAC;gBACnB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;gBAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;oBAC/B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;iBACrC;gBACD,OAAO,OAAO,CAAC;aACf;SACD;QAED,IAAI,MAAM,CAAC,SAAS,EAAE;YACrB,MAAM,OAAO,GAAG,EAAE,CAAC;YACnB,IAAI,KAAK,YAAY,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACzC,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;oBAC/B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC3B;gBACD,OAAO,OAAO,CAAC;aACf;YAED,IAAI,KAAK,YAAY,aAAa,CAAC,KAAK,EAAE;gBACzC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;gBAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;oBAC/B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;iBACvB;aACD;SACD;QAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC1B,OAAO,EAAE,CAAC;SACV;aAAM;YACN,OAAO,KAAK,CAAC;SACb;IACF,CAAC;IAEM,MAAM,KAAK,iCAAiC;QAClD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAC/B,MAAM,OAAO,GAAS,MAAO,CAAC,gBAAgB,CAAC;YAC/C,IAAI,CAAC,qBAAqB,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,+BAA+B,CAAC;YAChH,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;SACjC;QACD,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,KAAK;QACxB,OAAO,KAAK,YAAY,iBAAiB,IAAI,KAAK,YAAY,UAAU,IAAI,KAAK,YAAY,SAAS,IAAI,KAAK,YAAY,WAAW,IAAI,KAAK,YAAY,UAAU,IAAI,KAAK,YAAY,WAAW,IAAI,KAAK,YAAY,UAAU,IAAI,KAAK,YAAY,YAAY,CAAA;IACtQ,CAAC;;AAnDM,qCAA+B,GAAG,OAAO,CAAC;AAC1C,2BAAqB,GAAG,KAAK,CAAC;AAC9B,0BAAoB,GAAG,KAAK,CAAC;AAqDrC,MAAM,CAAC,OAAO,UAAU,IAAI,CAAI,MAAe;IAC9C,IAAI,MAAS,CAAC;IAEd,OAAO,GAAG,EAAE,CAAC,MAAM,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../packages/canvas/utils.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,KAAK;IAIV,MAAM,CAAC,SAAS,CAAC,KAAK;QAC5B,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YAClB,IAAI,KAAK,YAAY,OAAO,EAAE,CAAC;gBAC9B,MAAM,OAAO,GAAG,EAAE,CAAC;gBACnB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;gBAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;oBAChC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtC,CAAC;gBACD,OAAO,OAAO,CAAC;YAChB,CAAC;QACF,CAAC;QAED,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACtB,MAAM,OAAO,GAAG,EAAE,CAAC;YACnB,IAAI,KAAK,YAAY,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC1C,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;oBAChC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5B,CAAC;gBACD,OAAO,OAAO,CAAC;YAChB,CAAC;YAED,IAAI,KAAK,YAAY,aAAa,CAAC,KAAK,EAAE,CAAC;gBAC1C,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;gBAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;oBAChC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC;YACF,CAAC;QACF,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO,EAAE,CAAC;QACX,CAAC;aAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC;IAEM,MAAM,KAAK,iCAAiC;QAClD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAChC,MAAM,OAAO,GAAS,MAAO,CAAC,gBAAgB,CAAC;YAC/C,IAAI,CAAC,qBAAqB,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,+BAA+B,CAAC;YAChH,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QAClC,CAAC;QACD,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,KAAK;QACxB,OAAO,KAAK,YAAY,iBAAiB,IAAI,KAAK,YAAY,UAAU,IAAI,KAAK,YAAY,SAAS,IAAI,KAAK,YAAY,WAAW,IAAI,KAAK,YAAY,UAAU,IAAI,KAAK,YAAY,WAAW,IAAI,KAAK,YAAY,UAAU,IAAI,KAAK,YAAY,YAAY,CAAA;IACtQ,CAAC;;AAnDM,qCAA+B,GAAG,OAAO,CAAC;AAC1C,2BAAqB,GAAG,KAAK,CAAC;AAC9B,0BAAoB,GAAG,KAAK,CAAC;AAqDrC,MAAM,CAAC,OAAO,UAAU,IAAI,CAAI,MAAe;IAC9C,IAAI,MAAS,CAAC;IAEd,OAAO,GAAG,EAAE,CAAC,MAAM,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAC5C,CAAC"}

package/angular/fesm2015/nativescript-canvas-angular.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"nativescript-canvas-angular.mjs","sources":["../../../../../packages/canvas/angular/index.ts","../../../../../packages/canvas/angular/nativescript-canvas-angular.ts"],"sourcesContent":["import {NgModule, NO_ERRORS_SCHEMA} from '@angular/core';\nimport {registerElement} from '@nativescript/angular';\n\nregisterElement('Canvas', () => require('@nativescript/canvas').Canvas);\n\n\n@NgModule({\n  schemas: [NO_ERRORS_SCHEMA]\n})\n// @ts-ignore\nexport class CanvasModule {\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;;;AAGA,eAAe,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,sBAAsB,CAAC,CAAC,MAAM,CAAC,CAAC;AAMxE;MACa,YAAY,CAAA;;0GAAZ,YAAY,EAAA,IAAA,EAAA,EAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,QAAA,EAAA,CAAA,CAAA;2GAAZ,YAAY,EAAA,CAAA,CAAA;2GAAZ,YAAY,EAAA,CAAA,CAAA;4FAAZ,YAAY,EAAA,UAAA,EAAA,CAAA;kBAJxB,QAAQ;AAAC,YAAA,IAAA,EAAA,CAAA;oBACR,OAAO,EAAE,CAAC,gBAAgB,CAAC;iBAC5B,CAAA;;;ACRD;;AAEG;;;;"}

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

@@ -1,24 +0,0 @@
-import * as i0 from '@angular/core';
-import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
-import { registerElement } from '@nativescript/angular';
-
-registerElement('Canvas', () => require('@nativescript/canvas').Canvas);
-// @ts-ignore
-class CanvasModule {
-}
-CanvasModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: CanvasModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-CanvasModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.2.10", ngImport: i0, type: CanvasModule });
-CanvasModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: CanvasModule });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: CanvasModule, decorators: [{
-            type: NgModule,
-            args: [{
-                    schemas: [NO_ERRORS_SCHEMA]
-                }]
-        }] });
-
-/**
- * Generated bundle index. Do not edit.
- */
-
-export { CanvasModule };
-//# sourceMappingURL=nativescript-canvas-angular.mjs.map

package/angular/package.json

@@ -1,26 +0,0 @@
-{
-  "name": "nativescript-canvas-angular",
-  "module": "fesm2015/nativescript-canvas-angular.mjs",
-  "es2020": "fesm2020/nativescript-canvas-angular.mjs",
-  "esm2020": "esm2020/nativescript-canvas-angular.mjs",
-  "fesm2020": "fesm2020/nativescript-canvas-angular.mjs",
-  "fesm2015": "fesm2015/nativescript-canvas-angular.mjs",
-  "typings": "index.d.ts",
-  "exports": {
-    "./package.json": {
-      "default": "./package.json"
-    },
-    ".": {
-      "types": "./index.d.ts",
-      "esm2020": "./esm2020/nativescript-canvas-angular.mjs",
-      "es2020": "./fesm2020/nativescript-canvas-angular.mjs",
-      "es2015": "./fesm2015/nativescript-canvas-angular.mjs",
-      "node": "./fesm2015/nativescript-canvas-angular.mjs",
-      "default": "./fesm2020/nativescript-canvas-angular.mjs"
-    }
-  },
-  "sideEffects": false,
-  "dependencies": {
-    "tslib": "^2.3.0"
-  }
-}