@nativescript/canvas 2.0.0-webgpu.5 → 2.0.0-webgpu.7

package/platforms/ios/src/cpp/canvas2d/CanvasRenderingContext2DImpl.cpp

@@ -630,7 +630,7 @@ void CanvasRenderingContext2DImpl::DrawPoints(const v8::FunctionCallbackInfo<v8:
         }
 
         canvas_native_context_draw_points(
-                ptr->GetContext(), pointMode,
+                ptr->GetContext(), (int32_t)pointMode,
                 store.data(), store.size());
 
 

package/platforms/ios/src/cpp/canvas2d/Path2D.h

@@ -199,7 +199,7 @@ public:
                             double rotation,
                             double start_angle,
                             double end_angle,
-                            double anticlockwise) {
+                            bool anticlockwise) {
 
         canvas_native_path_ellipse(
                 receiver_obj,
@@ -222,7 +222,7 @@ public:
                             double rotation,
                             double start_angle,
                             double end_angle,
-                            double anticlockwise) {
+                            bool anticlockwise) {
         Path2D *ptr = GetPointer(receiver_obj);
         if (ptr == nullptr) {
             return;
@@ -362,9 +362,9 @@ public:
 
                 canvas_native_path_round_rect(
                         ptr->GetPath(),
-                        x, y,
-                        width,
-                        height, buf.data(),
+                        (float)x, (float)y,
+                        (float)width,
+                        (float)height, buf.data(),
                         buf.size());
 
             }

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

@@ -61,7 +61,6 @@ v8::Local<v8::FunctionTemplate> GPUAdapterImpl::GetCtor(v8::Isolate *isolate) {
             GetLimits
     );
 
-
     tmpl->Set(
             ConvertToV8String(isolate, "requestAdapterInfo"),
             v8::FunctionTemplate::New(isolate, &RequestAdapterInfo));
@@ -90,19 +89,19 @@ GPUAdapterImpl::GetFeatures(v8::Local<v8::Name> name,
 
         auto len = canvas_native_string_buffer_get_length(features);
 
-        auto map = v8::Map::New(isolate);
+        auto set = v8::Set::New(isolate);
         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);
-                map->Set(context, keyValue, keyValue);
+                auto keyValue = ConvertToV8String(isolate, (char *) item);
+                set->Add(context, keyValue);
                 canvas_native_string_destroy(item);
             }
 
         }
         canvas_native_string_buffer_release(features);
 
-        info.GetReturnValue().Set(map);
+        info.GetReturnValue().Set(set);
 
         return;
     }
@@ -162,11 +161,14 @@ struct RequestData {
     char *error_;
     const CanvasGPUDevice *device_;
     char **required_features_data_;
+    size_t required_features_data_size;
 
     ~RequestData() {
         if (required_features_data_ != nullptr) {
-            delete[] required_features_data_;
-            required_features_data_ = nullptr;
+            for (size_t i = 0; i < required_features_data_size; ++i) {
+                    delete[] required_features_data_[i];
+                }
+                delete[] required_features_data_;
         }
 
         if (error_ != nullptr) {
@@ -212,11 +214,9 @@ void GPUAdapterImpl::RequestDevice(const v8::FunctionCallbackInfo<v8::Value> &ar
                 &requiredFeaturesValue);
 
 
-        if (!requiredFeaturesValue.IsEmpty() && requiredFeaturesValue->IsSet()) {
-            v8::Local<v8::Set> requiredFeaturesSet = requiredFeaturesValue.As<v8::Set>();
-            v8::Local<v8::Array> requiredFeatures = requiredFeaturesSet->AsArray();
+        if (!requiredFeaturesValue.IsEmpty() && requiredFeaturesValue->IsArray()) {
+            v8::Local<v8::Array> requiredFeatures = requiredFeaturesValue.As<v8::Array>();
             auto len = requiredFeatures->Length();
-
             for (int i = 0; i < len; i++) {
                 auto item = requiredFeatures->Get(context, i);
                 if (!item.IsEmpty()) {
@@ -245,10 +245,12 @@ void GPUAdapterImpl::RequestDevice(const v8::FunctionCallbackInfo<v8::Value> &ar
     size_t required_features_data_length = required_features_buf.size();
 
     if (required_features_data_length > 0) {
-        required_features_data = new char *[required_features_data_length + 1];
+        required_features_data = new char *[required_features_data_length];
 
         for (size_t i = 0; i < required_features_data_length; ++i) {
-            std::strcpy(required_features_data[i], required_features_buf[i].c_str());
+            required_features_data[i] = new char[required_features_buf[i].size() + 1];
+            auto src = required_features_buf[i].c_str();
+            std::strcpy(required_features_data[i], src);
         }
     }
 
@@ -297,7 +299,6 @@ void GPUAdapterImpl::RequestDevice(const v8::FunctionCallbackInfo<v8::Value> &ar
                             callback->Call(context, context->Global(),
                                            1,
                                            args);  // ignore JS return value
-                            delete static_cast<AsyncCallback *>(data);
                         } else {
 
                             auto impl = new GPUDeviceImpl(requestData->device_);
@@ -311,14 +312,14 @@ void GPUAdapterImpl::RequestDevice(const v8::FunctionCallbackInfo<v8::Value> &ar
                             callback->Call(context, context->Global(),
                                            2,
                                            args);  // ignore JS return value
-
-                            delete static_cast<AsyncCallback *>(data);
                         }
 
                         if (requestData != nullptr) {
                             delete requestData;
                             requestData = nullptr;
                         }
+
+                        delete static_cast<AsyncCallback *>(data);
                     }
                 }
             }
@@ -330,7 +331,8 @@ void GPUAdapterImpl::RequestDevice(const v8::FunctionCallbackInfo<v8::Value> &ar
         inner->data = new RequestData{
                 nullptr,
                 nullptr,
-                required_features_data
+                required_features_data,
+                required_features_data_length
         };
     }
 

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

@@ -11,7 +11,7 @@
 
 class GPUBindGroupImpl : ObjectWrapperImpl {
 public:
-    GPUBindGroupImpl(const CanvasGPUBindGroup *group);
+    explicit GPUBindGroupImpl(const CanvasGPUBindGroup *group);
 
     ~GPUBindGroupImpl() {
         canvas_native_webgpu_bind_group_release(this->GetBindGroup());