@nativescript/canvas 2.0.0-beta.8 → 2.0.0-webgpu.0

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

@@ -19,7 +19,11 @@
 #include "webgl/WebGLRenderingContext.h"
 #include "webgl2/WebGL2RenderingContext.h"
 
-#include "URLImpl.h"
+#include "webgpu/GPUImpl.h"
+#include "webgpu/GPUSupportedLimitsImpl.h"
+#include "webgpu/GPUDeviceImpl.h"
+#include "webgpu/GPUQueueImpl.h"
+#include "webgpu/GPUCanvasContextImpl.h"
 
 class CanvasJSIModule {
 public:
@@ -37,6 +41,8 @@ public:
 
     static void CreateWebGL2Context(const v8::FunctionCallbackInfo<v8::Value> &args);
 
+    static void CreateWebGPUContextWithPointer(const v8::FunctionCallbackInfo<v8::Value> &args);
+
     static void AddFontFamily(const v8::FunctionCallbackInfo<v8::Value> &args);
 };
 

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

@@ -7,7 +7,6 @@
 #include <memory>
 #include "Common.h"
 #include "OneByteStringResource.h"
-#include "PerIsolateData.h"
 #include "v8-fast-api-calls.h"
 //#ifdef __APPLE__
 //#ifdef __OBJC__
@@ -19,6 +18,17 @@
 //#endif
 
 
+struct AsyncCallback {
+    v8::Isolate *isolate;
+    v8::Global<v8::Function> callback;
+    void *data;
+};
+
+struct PromiseCallback {
+    v8::Isolate *isolate;
+    v8::Global<v8::Promise::Resolver> callback;
+    void *data;
+};
 
 static const char *LOG_TAG = "JS";
 static int m_maxLogcatObjectSize = 4096;
@@ -126,7 +136,32 @@ enum class NativeType {
     WebGLUniformLocation,
     WebGLSampler,
     WebGLTransformFeedback,
-    WebGLSync
+    WebGLSync,
+
+    GPUAdapter,
+    GPUSupportedLimits,
+    GPUDevice,
+    GPUQueue,
+    GPUBuffer,
+    GPUInstance,
+    GPUCanvasContext,
+    GPUTexture,
+    GPUAdapterInfo,
+    GPUCommandEncoder,
+    GPUComputePass,
+    GPUQuerySet,
+    GPUShaderModule,
+    GPUPipelineLayout,
+    GPURenderPipeline,
+    GPUBindGroupLayout,
+    GPUTextureView,
+    GPURenderPassEncoder,
+    GPUCommandBuffer,
+    GPUBindGroup,
+    GPUComputePipeline,
+    GPUSampler,
+    GPURenderBundleEncoder,
+    GPURenderBundle
 };
 
 inline static v8::Local<v8::String>
@@ -176,7 +211,7 @@ static void SetPrivateValue(v8::Isolate *isolate, const v8::Local<v8::Object> &o
                             const v8::Local<v8::String> &propName,
                             const v8::Local<v8::Value> &value) {
     v8::Local<v8::Context> context;
-    obj->GetCreationContext().ToLocal(&context);
+    auto succcess = obj->GetCreationContext().ToLocal(&context);
     v8::Local<v8::Private> privateKey = v8::Private::ForApi(isolate, propName);
     obj->SetPrivate(context, privateKey, value);
 }
@@ -185,18 +220,18 @@ static v8::Local<v8::Value>
 GetPrivateValue(v8::Isolate *isolate, const v8::Local<v8::Object> &obj,
                 const v8::Local<v8::String> &propName) {
     v8::Local<v8::Context> context;
-    obj->GetCreationContext().ToLocal(&context);
+    auto succcess = obj->GetCreationContext().ToLocal(&context);
     v8::Local<v8::Private> privateKey = v8::Private::ForApi(isolate, propName);
 
     v8::Maybe<bool> hasPrivate = obj->HasPrivate(context, privateKey);
 
     if (!hasPrivate.FromMaybe(false)) {
-        return v8::Local<v8::Value>();
+        return {};
     }
 
     v8::Local<v8::Value> result;
 
-    obj->GetPrivate(context, privateKey).ToLocal(&result);
+    succcess = obj->GetPrivate(context, privateKey).ToLocal(&result);
 
     return result;
 }
@@ -207,7 +242,7 @@ static void SetNativeType(const v8::Local<v8::Object> &obj, NativeType type) {
 }
 
 inline static NativeType GetNativeType(const v8::Local<v8::Value> &obj) {
-    if (!obj->IsNullOrUndefined() && obj->IsObject() &&
+    if (!obj.IsEmpty() && !obj->IsNullOrUndefined() && obj->IsObject() &&
         obj.As<v8::Object>()->InternalFieldCount() > 1) {
         auto info = obj.As<v8::Object>()->GetAlignedPointerFromInternalField(1);
 
@@ -215,7 +250,7 @@ inline static NativeType GetNativeType(const v8::Local<v8::Value> &obj) {
             auto value = *static_cast<int32_t *>(info);
             auto ret = value;
             if (ret >= (int) NativeType::CanvasGradient &&
-                ret <= (int) NativeType::WebGLSync) {
+                ret <= (int) NativeType::GPURenderBundle) {
                 return (NativeType) ret;
             }
         }

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

@@ -28,7 +28,7 @@ void ImageAssetImpl::Init(v8::Local<v8::Object> canvasModule, v8::Isolate *isola
     auto context = isolate->GetCurrentContext();
     auto func = ctor->GetFunction(context).ToLocalChecked();
 
-    canvasModule->Set(context, ConvertToV8String(isolate, "ImageAsset"), func);
+    canvasModule->Set(context, ConvertToV8String(isolate, "ImageAsset"), func).IsJust();
 }
 
 ImageAssetImpl *ImageAssetImpl::GetPointer(const v8::Local<v8::Object> &object) {
@@ -67,8 +67,14 @@ v8::Local<v8::FunctionTemplate> ImageAssetImpl::GetCtor(v8::Isolate *isolate) {
             GetAddr);
 
     tmpl->Set(
-            ConvertToV8String(isolate, "scale"),
-            v8::FunctionTemplate::New(isolate, &Scale));
+            ConvertToV8String(isolate, "__getRef"),
+            v8::FunctionTemplate::New(isolate, GetReference));
+
+
+
+//    tmpl->Set(
+//            ConvertToV8String(isolate, "scale"),
+//            v8::FunctionTemplate::New(isolate, &Scale));
 
     tmpl->Set(
             ConvertToV8String(isolate, "fromUrlSync"),
@@ -97,14 +103,14 @@ v8::Local<v8::FunctionTemplate> ImageAssetImpl::GetCtor(v8::Isolate *isolate) {
             v8::FunctionTemplate::New(isolate, &FromBytesCb));
 
 
-    tmpl->Set(
-            ConvertToV8String(isolate, "saveSync"),
-            v8::FunctionTemplate::New(isolate, &SaveSync));
-
-    tmpl->Set(
-            ConvertToV8String(isolate, "saveCb"),
-            v8::FunctionTemplate::New(isolate, &SaveCb));
+    /*   tmpl->Set(
+               ConvertToV8String(isolate, "saveSync"),
+               v8::FunctionTemplate::New(isolate, &SaveSync));
 
+       tmpl->Set(
+               ConvertToV8String(isolate, "saveCb"),
+               v8::FunctionTemplate::New(isolate, &SaveCb));
+   */
 
     cache->ImageAssetTmpl =
             std::make_unique<v8::Persistent<v8::FunctionTemplate>>(isolate, ctorTmpl);
@@ -160,14 +166,28 @@ ImageAssetImpl::GetAddr(v8::Local<v8::String> name,
     auto ptr = GetPointer(info.This());
     if (ptr != nullptr) {
         auto isolate = info.GetIsolate();
-        auto addr = static_cast<intptr_t *>(static_cast<void *>(ptr->GetImageAsset()));
-        auto ret = std::to_string(*addr);
-        info.GetReturnValue().Set(ConvertToV8String(isolate, ret.c_str()));
+        auto ret = std::to_string(canvas_native_image_asset_get_addr(ptr->GetImageAsset()));
+        info.GetReturnValue().Set(ConvertToV8String(isolate, ret));
         return;
     }
     info.GetReturnValue().SetEmptyString();
 }
 
+
+void
+ImageAssetImpl::GetReference(const v8::FunctionCallbackInfo<v8::Value> &args) {
+    auto ptr = GetPointer(args.This());
+    if (ptr != nullptr) {
+        auto isolate = args.GetIsolate();
+        auto reference = canvas_native_image_asset_shared_clone(ptr->GetImageAsset());
+        auto ret = std::to_string(canvas_native_image_asset_get_addr(reference));
+        args.GetReturnValue().Set(ConvertToV8String(isolate, ret));
+        return;
+    }
+
+    args.GetReturnValue().SetEmptyString();
+}
+
 void
 ImageAssetImpl::GetError(v8::Local<v8::String> name,
                          const v8::PropertyCallbackInfo<v8::Value> &info) {
@@ -182,26 +202,6 @@ ImageAssetImpl::GetError(v8::Local<v8::String> name,
     info.GetReturnValue().SetEmptyString();
 }
 
-void ImageAssetImpl::Scale(const v8::FunctionCallbackInfo<v8::Value> &args) {
-    ImageAssetImpl *ptr = GetPointer(args.This());
-    if (ptr == nullptr) {
-        args.GetReturnValue().SetUndefined();
-        return;
-    }
-    auto isolate = args.GetIsolate();
-    auto context = isolate->GetCurrentContext();
-
-    if (args.Length() > 1) {
-        auto x = args[0]->Uint32Value(context).ToChecked();
-        auto y = args[1]->Uint32Value(context).ToChecked();
-        if (x > 0 && y > 0) {
-            canvas_native_image_asset_scale(
-                    ptr->GetImageAsset(), x,
-                    y);
-        }
-    }
-}
-
 void ImageAssetImpl::FromUrlSync(const v8::FunctionCallbackInfo<v8::Value> &args) {
     ImageAssetImpl *ptr = GetPointer(args.This());
     if (ptr == nullptr) {
@@ -396,7 +396,6 @@ void ImageAssetImpl::FromFileSync(const v8::FunctionCallbackInfo<v8::Value> &arg
 
     auto done = canvas_native_image_asset_load_from_path(ptr->GetImageAsset(), path.c_str());
 
-
     args.GetReturnValue().Set(done);
 }
 
@@ -411,7 +410,6 @@ void ImageAssetImpl::FromFileCb(const v8::FunctionCallbackInfo<v8::Value> &args)
         return;
     }
 
-
     auto path = ConvertFromV8String(isolate, args[0]);
 
     auto asset = canvas_native_image_asset_shared_clone(
@@ -471,8 +469,6 @@ void ImageAssetImpl::FromFileCb(const v8::FunctionCallbackInfo<v8::Value> &args)
 
             }, std::move(path));
 
-    thread.detach();
-
 #endif
 
 
@@ -672,6 +668,7 @@ void ImageAssetImpl::FromBytesCb(const v8::FunctionCallbackInfo<v8::Value> &args
 
 }
 
+/*
 void ImageAssetImpl::SaveSync(const v8::FunctionCallbackInfo<v8::Value> &args) {
     ImageAssetImpl *ptr = GetPointer(args.This());
     if (ptr == nullptr) {
@@ -814,6 +811,7 @@ void ImageAssetImpl::SaveCb(const v8::FunctionCallbackInfo<v8::Value> &args) {
 
 
 }
+*/
 
 ImageAsset *ImageAssetImpl::GetImageAsset() {
     return this->asset_;

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

@@ -9,23 +9,25 @@
 #include <vector>
 #include "Helpers.h"
 #include "Common.h"
+
 #ifdef __APPLE__
 #include "NSOperationQueueWrapper.h"
 #endif
+
 #include "ObjectWrapperImpl.h"
 
-class ImageAssetImpl: ObjectWrapperImpl{
+class ImageAssetImpl : ObjectWrapperImpl {
 public:
 
-    ImageAssetImpl(ImageAsset* asset);
+    explicit ImageAssetImpl(ImageAsset *asset);
 
     ~ImageAssetImpl();
 
-    ImageAsset* GetImageAsset();
+    ImageAsset *GetImageAsset();
 
     static void Init(v8::Local<v8::Object> canvasModule, v8::Isolate *isolate);
 
-    static ImageAssetImpl *GetPointer(const v8::Local<v8::Object>& object);
+    static ImageAssetImpl *GetPointer(const v8::Local<v8::Object> &object);
 
     static v8::Local<v8::FunctionTemplate> GetCtor(v8::Isolate *isolate);
 
@@ -38,12 +40,14 @@ public:
                           const v8::PropertyCallbackInfo<v8::Value> &info);
 
     static void GetAddr(v8::Local<v8::String> name,
-                         const v8::PropertyCallbackInfo<v8::Value> &info);
+                        const v8::PropertyCallbackInfo<v8::Value> &info);
+
+    static void GetReference(const v8::FunctionCallbackInfo<v8::Value> &args);
 
     static void GetError(v8::Local<v8::String> name,
-                          const v8::PropertyCallbackInfo<v8::Value> &info);
+                         const v8::PropertyCallbackInfo<v8::Value> &info);
 
-    static void Scale(const v8::FunctionCallbackInfo<v8::Value> &args);
+//    static void Scale(const v8::FunctionCallbackInfo<v8::Value> &args);
 
     static void FromUrlSync(const v8::FunctionCallbackInfo<v8::Value> &args);
 
@@ -57,11 +61,11 @@ public:
 
     static void FromBytesCb(const v8::FunctionCallbackInfo<v8::Value> &args);
 
-    static void SaveSync(const v8::FunctionCallbackInfo<v8::Value> &args);
+    /* static void SaveSync(const v8::FunctionCallbackInfo<v8::Value> &args);
 
-    static void SaveCb(const v8::FunctionCallbackInfo<v8::Value> &args);
+     static void SaveCb(const v8::FunctionCallbackInfo<v8::Value> &args);*/
 
 
 private:
-    ImageAsset* asset_;
+    ImageAsset *asset_;
 };

package/platforms/ios/src/cpp/ImageBitmapImpl.cpp

@@ -121,11 +121,11 @@ ImageBitmapImpl::HandleOptions(v8::Isolate *isolate, const v8::Local<v8::Value>
             auto premultiplyAlpha = ConvertFromV8String(isolate, premultiplyAlphaValue);
 
             if (premultiplyAlpha == "premultiply") {
-                ret.premultiplyAlpha = ImageBitmapPremultiplyAlphaPremultiply;
+                ret.premultiplyAlpha = ImageBitmapPremultiplyAlpha::ImageBitmapPremultiplyAlphaPremultiply;
             }
 
             if (premultiplyAlpha == "none") {
-                ret.premultiplyAlpha = ImageBitmapPremultiplyAlphaNone;
+                ret.premultiplyAlpha = ImageBitmapPremultiplyAlpha::ImageBitmapPremultiplyAlphaAlphaNone;
             }
         }
 

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

@@ -21,7 +21,7 @@ struct Options {
 
 class ImageBitmapImpl : public ObjectWrapperImpl {
 public:
-    ImageBitmapImpl(ImageAsset *asset);
+    explicit ImageBitmapImpl(ImageAsset *asset);
 
     ~ImageBitmapImpl();
 

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

@@ -31,16 +31,6 @@ CanvasPattern *CanvasPattern::GetPointer(const v8::Local<v8::Object> &object) {
     return static_cast<CanvasPattern *>(ptr);
 }
 
-static v8::Local<v8::Object> NewInstance(v8::Isolate *isolate, CanvasPattern *pattern) {
-    auto context = isolate->GetCurrentContext();
-    v8::EscapableHandleScope scope(isolate);
-    auto object = CanvasPattern::GetCtor(isolate)->GetFunction(
-            context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-    SetNativeType(object, NativeType::CanvasPattern);
-    object->SetAlignedPointerInInternalField(0, pattern);
-    return scope.Escape(object);
-}
-
 v8::Local<v8::FunctionTemplate> CanvasPattern::GetCtor(v8::Isolate *isolate) {
     auto cache = Caches::Get(isolate);
     auto ctor = cache->CanvasPatternTmpl.get();

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

@@ -5,6 +5,7 @@
 #include "CanvasRenderingContext2DImpl.h"
 #include "Caches.h"
 #include "OneByteStringResource.h"
+#include "WebGLRenderingContextBase.h"
 
 v8::CFunction CanvasRenderingContext2DImpl::fast_start_raf_(
         v8::CFunction::Make(CanvasRenderingContext2DImpl::__FastStartRaf));
@@ -254,7 +255,7 @@ void CanvasRenderingContext2DImpl::Init(v8::Local<v8::Object> canvasModule, v8::
     auto context = isolate->GetCurrentContext();
     auto func = ctor->GetFunction(context).ToLocalChecked();
 
-    canvasModule->Set(context, ConvertToV8String(isolate, "CanvasRenderingContext2D"), func);
+    canvasModule->Set(context, ConvertToV8String(isolate, "CanvasRenderingContext2D"), func).FromJust();
 }
 
 CanvasRenderingContext2DImpl *
@@ -1380,7 +1381,7 @@ void CanvasRenderingContext2DImpl::GetLineDash(v8::Local<v8::String> property,
     auto ret = v8::Array::New(isolate, (int) size);
     for (int i = 0; i < size; i++) {
         auto item = buf[i];
-        ret->Set(context, i, v8::Number::New(isolate, (double) item));
+        ret->Set(context, i, v8::Number::New(isolate, (double) item)).FromJust();
     }
 
 }
@@ -1943,7 +1944,7 @@ CanvasRenderingContext2DImpl::DrawAtlas(const v8::FunctionCallbackInfo<v8::Value
         int32_t mode = 4;
 
         if (blendValue->IsInt32()) {
-            blendValue->Int32Value(context).To(&mode);
+            auto val = blendValue->Int32Value(context).To(&mode);
         }
 
         if (colorsValue->IsArray()) {
@@ -2081,6 +2082,17 @@ CanvasRenderingContext2DImpl::DrawImage(const v8::FunctionCallbackInfo<v8::Value
                 }
             }
                 break;
+            case NativeType::WebGLRenderingContextBase: {
+                auto gl = WebGLRenderingContextBase::GetPointer(image);
+                if (gl != nullptr) {
+                    canvas_native_context_draw_image_dx_dy_webgl(
+                            ptr->GetContext(),
+                            gl->GetState(),
+                            dx, dy
+                    );
+                }
+            }
+                break;
             default:
                 break;
         }
@@ -2131,6 +2143,17 @@ CanvasRenderingContext2DImpl::DrawImage(const v8::FunctionCallbackInfo<v8::Value
                 }
             }
                 break;
+            case NativeType::WebGLRenderingContextBase: {
+                auto gl = WebGLRenderingContextBase::GetPointer(image);
+                if (gl != nullptr) {
+                    canvas_native_context_draw_image_dx_dy_dw_dh_webgl(
+                            ptr->GetContext(),
+                            gl->GetState(),
+                            dx, dy, dWidth, dHeight
+                    );
+                }
+            }
+                break;
             default:
                 break;
         }
@@ -2189,6 +2212,20 @@ CanvasRenderingContext2DImpl::DrawImage(const v8::FunctionCallbackInfo<v8::Value
                 }
             }
                 break;
+            case NativeType::WebGLRenderingContextBase: {
+                auto gl = WebGLRenderingContextBase::GetPointer(image);
+                if (gl != nullptr) {
+                    canvas_native_context_draw_image_webgl(
+                            ptr->GetContext(),
+                            gl->GetState(),
+                            sx,
+                            sy, sWidth, sHeight,
+                            dx,
+                            dy, dWidth, dHeight
+                    );
+                }
+            }
+                break;
             default:
                 break;
         }
@@ -2402,7 +2439,7 @@ CanvasRenderingContext2DImpl::GetLineDash(const v8::FunctionCallbackInfo<v8::Val
     for (int i = 0; i < size; ++i) {
         array->Set(context, i,
                    v8::Number::New(isolate,
-                                   (double) buf[i]));
+                                   (double) buf[i])).FromJust();
     }
 
     args.GetReturnValue().Set(array);