@nativescript/canvas 2.0.0-webgpu.2 → 2.0.0-webgpu.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Canvas/common.d.ts +3 -4
- package/Canvas/common.js +35 -125
- package/Canvas/common.js.map +1 -1
- package/Canvas/index.android.d.ts +0 -1
- package/Canvas/index.android.js +45 -38
- package/Canvas/index.android.js.map +1 -1
- package/Canvas/index.d.ts +11 -3
- package/Canvas/index.ios.js +49 -40
- package/Canvas/index.ios.js.map +1 -1
- package/Canvas/utils.d.ts +3 -0
- package/Canvas/utils.js +85 -0
- package/Canvas/utils.js.map +1 -0
- package/Canvas2D/CanvasRenderingContext2D/index.d.ts +1 -0
- package/Canvas2D/CanvasRenderingContext2D/index.js +1 -0
- package/Canvas2D/CanvasRenderingContext2D/index.js.map +1 -1
- package/Dom/Group.d.ts +1 -2
- package/Dom/Group.js.map +1 -1
- package/Dom/Image.js +0 -1
- package/Dom/Image.js.map +1 -1
- package/Dom/Paint.d.ts +1 -1
- package/Dom/shapes/Path.d.ts +1 -1
- package/ImageAsset/index.js +77 -33
- package/ImageAsset/index.js.map +1 -1
- package/ImageBitmap/index.js +107 -20
- package/ImageBitmap/index.js.map +1 -1
- package/README.md +2 -4
- package/WebGL/WebGLRenderingContext/index.js +73 -31
- package/WebGL/WebGLRenderingContext/index.js.map +1 -1
- package/WebGL2/WebGL2RenderingContext/index.js +4 -4
- package/WebGL2/WebGL2RenderingContext/index.js.map +1 -1
- package/WebGPU/GPU.js +4 -3
- package/WebGPU/GPU.js.map +1 -1
- package/WebGPU/GPUAdapter.d.ts +6 -3
- package/WebGPU/GPUAdapter.js +31 -0
- package/WebGPU/GPUAdapter.js.map +1 -1
- package/WebGPU/GPUBindGroup.d.ts +1 -0
- package/WebGPU/GPUBindGroup.js +3 -0
- package/WebGPU/GPUBindGroup.js.map +1 -1
- package/WebGPU/GPUBindGroupLayout.d.ts +1 -0
- package/WebGPU/GPUBindGroupLayout.js +3 -0
- package/WebGPU/GPUBindGroupLayout.js.map +1 -1
- package/WebGPU/GPUBuffer.js +10 -2
- package/WebGPU/GPUBuffer.js.map +1 -1
- package/WebGPU/GPUCanvasContext.d.ts +3 -2
- package/WebGPU/GPUCanvasContext.js +52 -10
- package/WebGPU/GPUCanvasContext.js.map +1 -1
- package/WebGPU/GPUCommandBuffer.d.ts +1 -0
- package/WebGPU/GPUCommandBuffer.js +3 -0
- package/WebGPU/GPUCommandBuffer.js.map +1 -1
- package/WebGPU/GPUCommandEncoder.d.ts +3 -9
- package/WebGPU/GPUCommandEncoder.js +94 -41
- package/WebGPU/GPUCommandEncoder.js.map +1 -1
- package/WebGPU/GPUComputePassEncoder.d.ts +1 -0
- package/WebGPU/GPUComputePassEncoder.js +3 -0
- package/WebGPU/GPUComputePassEncoder.js.map +1 -1
- package/WebGPU/GPUComputePipeline.d.ts +1 -0
- package/WebGPU/GPUComputePipeline.js +3 -0
- package/WebGPU/GPUComputePipeline.js.map +1 -1
- package/WebGPU/GPUDevice.d.ts +17 -79
- package/WebGPU/GPUDevice.js +72 -91
- package/WebGPU/GPUDevice.js.map +1 -1
- package/WebGPU/GPUExternalTexture.d.ts +1 -0
- package/WebGPU/GPUExternalTexture.js +3 -0
- package/WebGPU/GPUExternalTexture.js.map +1 -1
- package/WebGPU/GPUPipelineLayout.d.ts +1 -0
- package/WebGPU/GPUPipelineLayout.js +3 -0
- package/WebGPU/GPUPipelineLayout.js.map +1 -1
- package/WebGPU/GPUQuerySet.d.ts +1 -0
- package/WebGPU/GPUQuerySet.js +3 -0
- package/WebGPU/GPUQuerySet.js.map +1 -1
- package/WebGPU/GPUQueue.d.ts +1 -0
- package/WebGPU/GPUQueue.js +45 -7
- package/WebGPU/GPUQueue.js.map +1 -1
- package/WebGPU/GPURenderBundle.d.ts +1 -0
- package/WebGPU/GPURenderBundle.js +3 -0
- package/WebGPU/GPURenderBundle.js.map +1 -1
- package/WebGPU/GPURenderBundleEncoder.d.ts +4 -2
- package/WebGPU/GPURenderBundleEncoder.js +7 -3
- package/WebGPU/GPURenderBundleEncoder.js.map +1 -1
- package/WebGPU/GPURenderPassEncoder.d.ts +2 -1
- package/WebGPU/GPURenderPassEncoder.js +5 -2
- package/WebGPU/GPURenderPassEncoder.js.map +1 -1
- package/WebGPU/GPURenderPipeline.d.ts +1 -0
- package/WebGPU/GPURenderPipeline.js +3 -0
- package/WebGPU/GPURenderPipeline.js.map +1 -1
- package/WebGPU/GPUSampler.d.ts +1 -0
- package/WebGPU/GPUSampler.js +3 -0
- package/WebGPU/GPUSampler.js.map +1 -1
- package/WebGPU/GPUShaderModule.d.ts +1 -1
- package/WebGPU/GPUShaderModule.js +2 -2
- package/WebGPU/GPUShaderModule.js.map +1 -1
- package/WebGPU/GPUTexture.d.ts +1 -0
- package/WebGPU/GPUTexture.js +3 -0
- package/WebGPU/GPUTexture.js.map +1 -1
- package/WebGPU/GPUTextureView.d.ts +1 -0
- package/WebGPU/GPUTextureView.js +3 -0
- package/WebGPU/GPUTextureView.js.map +1 -1
- package/WebGPU/Interfaces.d.ts +95 -4
- package/WebGPU/Types.d.ts +9 -1
- package/WebGPU/Utils.d.ts +6 -0
- package/WebGPU/Utils.js +221 -0
- package/WebGPU/Utils.js.map +1 -1
- package/angular/esm2022/index.mjs +4 -4
- package/angular/fesm2022/nativescript-canvas-angular.mjs +4 -4
- package/angular/package.json +20 -0
- package/package.json +1 -3
- package/platforms/android/canvas-release.aar +0 -0
- package/platforms/ios/CanvasNative.xcframework/Info.plist +5 -5
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/CanvasNative-Swift.h +9 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/canvas_ios.h +7 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/canvas_native.h +226 -61
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Info.plist +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.abi.json +6871 -5995
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.private.swiftinterface +7 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.swiftinterface +7 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/Relocations/aarch64/CanvasNative.yml +656 -644
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Headers/CanvasNative-Swift.h +18 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Headers/canvas_ios.h +7 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Headers/canvas_native.h +226 -61
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Info.plist +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json +6871 -5995
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface +7 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftinterface +7 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json +6871 -5995
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface +7 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +7 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources +27 -27
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative +0 -0
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/Relocations/aarch64/CanvasNative.yml +658 -646
- package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/Relocations/x86_64/CanvasNative.yml +696 -684
- package/platforms/ios/src/NSOperationQueueWrapper.h +3 -1
- package/platforms/ios/src/NSOperationQueueWrapper.mm +41 -9
- package/platforms/ios/src/cpp/AsyncCallback.h +214 -0
- package/platforms/ios/src/cpp/CanvasJSIModule.cpp +123 -47
- package/platforms/ios/src/cpp/Helpers.h +2 -164
- package/platforms/ios/src/cpp/ImageAssetImpl.cpp +18 -26
- package/platforms/ios/src/cpp/ImageAssetImpl.h +3 -3
- package/platforms/ios/src/cpp/ImageBitmapImpl.cpp +60 -3
- package/platforms/ios/src/cpp/ImageBitmapImpl.h +12 -4
- package/platforms/ios/src/cpp/NativeType.h +87 -0
- package/platforms/ios/src/cpp/ObjectWrapperImpl.h +50 -0
- package/platforms/ios/src/cpp/PromiseCallback.h +197 -0
- package/platforms/ios/src/cpp/canvas2d/CanvasGradient.h +7 -6
- package/platforms/ios/src/cpp/canvas2d/CanvasPattern.cpp +1 -1
- package/platforms/ios/src/cpp/canvas2d/CanvasPattern.h +1 -1
- package/platforms/ios/src/cpp/canvas2d/CanvasRenderingContext2DImpl.cpp +6 -6
- package/platforms/ios/src/cpp/canvas2d/CanvasRenderingContext2DImpl.h +18 -13
- package/platforms/ios/src/cpp/canvas2d/ImageDataImpl.cpp +2 -2
- package/platforms/ios/src/cpp/canvas2d/ImageDataImpl.h +1 -1
- package/platforms/ios/src/cpp/canvas2d/MatrixImpl.cpp +10 -10
- package/platforms/ios/src/cpp/canvas2d/Path2D.cpp +6 -3
- package/platforms/ios/src/cpp/canvas2d/Path2D.h +5 -5
- package/platforms/ios/src/cpp/webgl/WebGLActiveInfoImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/WebGLBuffer.h +1 -1
- package/platforms/ios/src/cpp/webgl/WebGLFramebuffer.h +1 -1
- package/platforms/ios/src/cpp/webgl/WebGLProgram.h +3 -3
- package/platforms/ios/src/cpp/webgl/WebGLRenderbuffer.h +3 -3
- package/platforms/ios/src/cpp/webgl/WebGLRenderingContext.cpp +106 -1
- package/platforms/ios/src/cpp/webgl/WebGLRenderingContext.h +1 -1
- package/platforms/ios/src/cpp/webgl/WebGLShader.h +1 -1
- package/platforms/ios/src/cpp/webgl/WebGLShaderPrecisionFormatImpl.h +5 -5
- package/platforms/ios/src/cpp/webgl/WebGLTexture.h +3 -2
- package/platforms/ios/src/cpp/webgl/WebGLUniformLocation.h +2 -2
- package/platforms/ios/src/cpp/webgl/extensions/ANGLE_instanced_arraysImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/EXT_blend_minmaxImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/EXT_color_buffer_half_floatImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/EXT_disjoint_timer_queryImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/EXT_sRGBImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/EXT_shader_texture_lodImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/EXT_texture_filter_anisotropicImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/OES_element_index_uintImpl.h +2 -2
- package/platforms/ios/src/cpp/webgl/extensions/OES_fbo_render_mipmap.h +5 -5
- package/platforms/ios/src/cpp/webgl/extensions/OES_standard_derivativesImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/OES_texture_floatImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/OES_texture_float_linearImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/OES_texture_half_floatImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/OES_texture_half_float_linearImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/OES_vertex_array_objectImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/WEBGL_color_buffer_floatImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/WEBGL_compressed_texture_atcImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/WEBGL_compressed_texture_etc1Impl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/WEBGL_compressed_texture_etcImpl.h +2 -2
- package/platforms/ios/src/cpp/webgl/extensions/WEBGL_compressed_texture_pvrtcImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/WEBGL_compressed_texture_s3tcImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/WEBGL_compressed_texture_s3tc_srgbImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/WEBGL_depth_textureImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/WEBGL_draw_buffersImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl/extensions/WEBGL_lose_contextImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl2/WebGL2RenderingContext.h +1 -1
- package/platforms/ios/src/cpp/webgl2/WebGLQuery.h +1 -1
- package/platforms/ios/src/cpp/webgl2/WebGLSampler.h +1 -1
- package/platforms/ios/src/cpp/webgl2/WebGLSyncImpl.h +1 -1
- package/platforms/ios/src/cpp/webgl2/WebGLTransformFeedback.h +1 -1
- package/platforms/ios/src/cpp/webgl2/WebGLVertexArrayObject.h +2 -2
- package/platforms/ios/src/cpp/webgpu/GPUAdapterImpl.cpp +142 -73
- package/platforms/ios/src/cpp/webgpu/GPUAdapterImpl.h +1 -1
- package/platforms/ios/src/cpp/webgpu/GPUAdapterInfoImpl.cpp +1 -1
- package/platforms/ios/src/cpp/webgpu/GPUAdapterInfoImpl.h +1 -1
- package/platforms/ios/src/cpp/webgpu/GPUBindGroupImpl.cpp +32 -6
- package/platforms/ios/src/cpp/webgpu/GPUBindGroupImpl.h +5 -2
- package/platforms/ios/src/cpp/webgpu/GPUBindGroupLayoutImpl.cpp +27 -1
- package/platforms/ios/src/cpp/webgpu/GPUBindGroupLayoutImpl.h +4 -1
- package/platforms/ios/src/cpp/webgpu/GPUBufferImpl.cpp +80 -32
- package/platforms/ios/src/cpp/webgpu/GPUBufferImpl.h +8 -4
- package/platforms/ios/src/cpp/webgpu/GPUCanvasContextImpl.cpp +11 -5
- package/platforms/ios/src/cpp/webgpu/GPUCanvasContextImpl.h +1 -1
- package/platforms/ios/src/cpp/webgpu/GPUCommandBufferImpl.cpp +29 -2
- package/platforms/ios/src/cpp/webgpu/GPUCommandBufferImpl.h +4 -1
- package/platforms/ios/src/cpp/webgpu/GPUCommandEncoderImpl.cpp +101 -106
- package/platforms/ios/src/cpp/webgpu/GPUCommandEncoderImpl.h +5 -1
- package/platforms/ios/src/cpp/webgpu/GPUComputePassEncoderImpl.cpp +42 -14
- package/platforms/ios/src/cpp/webgpu/GPUComputePassEncoderImpl.h +4 -1
- package/platforms/ios/src/cpp/webgpu/GPUComputePipelineImpl.cpp +26 -1
- package/platforms/ios/src/cpp/webgpu/GPUComputePipelineImpl.h +3 -1
- package/platforms/ios/src/cpp/webgpu/GPUDeviceImpl.cpp +1683 -733
- package/platforms/ios/src/cpp/webgpu/GPUDeviceImpl.h +3 -1
- package/platforms/ios/src/cpp/webgpu/GPUImpl.cpp +53 -39
- package/platforms/ios/src/cpp/webgpu/GPUImpl.h +2 -2
- package/platforms/ios/src/cpp/webgpu/GPULabel.h +33 -0
- package/platforms/ios/src/cpp/webgpu/GPUPipelineLayoutImpl.cpp +27 -1
- package/platforms/ios/src/cpp/webgpu/GPUPipelineLayoutImpl.h +8 -5
- package/platforms/ios/src/cpp/webgpu/GPUQuerySetImpl.cpp +2 -3
- package/platforms/ios/src/cpp/webgpu/GPUQuerySetImpl.h +2 -2
- package/platforms/ios/src/cpp/webgpu/GPUQueueImpl.cpp +88 -36
- package/platforms/ios/src/cpp/webgpu/GPUQueueImpl.h +4 -1
- package/platforms/ios/src/cpp/webgpu/GPURenderBundleEncoderImpl.cpp +43 -14
- package/platforms/ios/src/cpp/webgpu/GPURenderBundleEncoderImpl.h +4 -1
- package/platforms/ios/src/cpp/webgpu/GPURenderBundleImpl.cpp +26 -1
- package/platforms/ios/src/cpp/webgpu/GPURenderBundleImpl.h +4 -1
- package/platforms/ios/src/cpp/webgpu/GPURenderPassEncoderImpl.cpp +40 -14
- package/platforms/ios/src/cpp/webgpu/GPURenderPassEncoderImpl.h +4 -1
- package/platforms/ios/src/cpp/webgpu/GPURenderPipelineImpl.cpp +26 -1
- package/platforms/ios/src/cpp/webgpu/GPURenderPipelineImpl.h +4 -1
- package/platforms/ios/src/cpp/webgpu/GPUSamplerImpl.cpp +27 -1
- package/platforms/ios/src/cpp/webgpu/GPUSamplerImpl.h +5 -2
- package/platforms/ios/src/cpp/webgpu/GPUShaderModuleImpl.cpp +25 -1
- package/platforms/ios/src/cpp/webgpu/GPUShaderModuleImpl.h +5 -2
- package/platforms/ios/src/cpp/webgpu/GPUSupportedLimitsImpl.cpp +2 -2
- package/platforms/ios/src/cpp/webgpu/GPUSupportedLimitsImpl.h +2 -2
- package/platforms/ios/src/cpp/webgpu/GPUTextureImpl.cpp +34 -8
- package/platforms/ios/src/cpp/webgpu/GPUTextureImpl.h +6 -4
- package/platforms/ios/src/cpp/webgpu/GPUTextureViewImpl.cpp +27 -1
- package/platforms/ios/src/cpp/webgpu/GPUTextureViewImpl.h +5 -2
- package/platforms/ios/src/cpp/webgpu/GPUUtils.h +511 -0
- package/utils.d.ts +1 -1
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
#pragma once
|
|
2
|
+
|
|
1
3
|
#include <functional>
|
|
2
4
|
class NSOperationQueueWrapper {
|
|
3
5
|
public:
|
|
4
|
-
NSOperationQueueWrapper(bool currentQueue);
|
|
6
|
+
NSOperationQueueWrapper(bool currentQueue, bool serial = false);
|
|
5
7
|
~NSOperationQueueWrapper();
|
|
6
8
|
|
|
7
9
|
void addOperation(std::function<void()> task);
|
|
@@ -7,12 +7,16 @@
|
|
|
7
7
|
|
|
8
8
|
@implementation NSOperationQueueWrapperObjC {
|
|
9
9
|
NSOperationQueue* operationQueue;
|
|
10
|
+
__CFRunLoop* current;
|
|
11
|
+
BOOL isSerial;
|
|
10
12
|
}
|
|
11
13
|
|
|
12
14
|
- (instancetype)init {
|
|
13
15
|
self = [super init];
|
|
14
16
|
if (self) {
|
|
15
|
-
|
|
17
|
+
isSerial = false;
|
|
18
|
+
operationQueue = NULL;
|
|
19
|
+
current = NULL;
|
|
16
20
|
}
|
|
17
21
|
return self;
|
|
18
22
|
}
|
|
@@ -20,7 +24,15 @@
|
|
|
20
24
|
-(instancetype)initWithCurrentQueue {
|
|
21
25
|
self = [super init];
|
|
22
26
|
if (self) {
|
|
23
|
-
|
|
27
|
+
current = CFRunLoopGetCurrent();
|
|
28
|
+
}
|
|
29
|
+
return self;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
-(instancetype)initWithSerial:(BOOL)serial {
|
|
33
|
+
self = [super init];
|
|
34
|
+
if (self) {
|
|
35
|
+
isSerial = serial;
|
|
24
36
|
}
|
|
25
37
|
return self;
|
|
26
38
|
}
|
|
@@ -28,11 +40,32 @@
|
|
|
28
40
|
- (void)dealloc {}
|
|
29
41
|
|
|
30
42
|
- (void)addOperation:(void (^)())task {
|
|
31
|
-
NSBlockOperation* operation = [NSBlockOperation blockOperationWithBlock:^{
|
|
32
|
-
task();
|
|
33
|
-
}];
|
|
34
43
|
|
|
35
|
-
|
|
44
|
+
if(current != NULL){
|
|
45
|
+
if(current == CFRunLoopGetCurrent()){
|
|
46
|
+
task();
|
|
47
|
+
}else {
|
|
48
|
+
CFRunLoopPerformBlock(current, kCFRunLoopDefaultMode, ^{
|
|
49
|
+
task();
|
|
50
|
+
});
|
|
51
|
+
CFRunLoopWakeUp(current);
|
|
52
|
+
}
|
|
53
|
+
}else if(operationQueue != NULL){
|
|
54
|
+
NSBlockOperation* operation = [NSBlockOperation blockOperationWithBlock:^{
|
|
55
|
+
task();
|
|
56
|
+
}];
|
|
57
|
+
|
|
58
|
+
[operationQueue addOperation:operation];
|
|
59
|
+
}else if(isSerial){
|
|
60
|
+
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_SERIAL, 0), ^{
|
|
61
|
+
task();
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
}else {
|
|
65
|
+
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
|
66
|
+
task();
|
|
67
|
+
});
|
|
68
|
+
}
|
|
36
69
|
}
|
|
37
70
|
|
|
38
71
|
- (NSOperationQueue*)getOperationQueue {
|
|
@@ -42,7 +75,7 @@
|
|
|
42
75
|
|
|
43
76
|
@end
|
|
44
77
|
|
|
45
|
-
NSOperationQueueWrapper::NSOperationQueueWrapper(bool currentQueue) {
|
|
78
|
+
NSOperationQueueWrapper::NSOperationQueueWrapper(bool currentQueue, bool serial) {
|
|
46
79
|
if (currentQueue) {
|
|
47
80
|
NSOperationQueueWrapperObjC* objcWrapper = [[NSOperationQueueWrapperObjC alloc] initWithCurrentQueue];
|
|
48
81
|
|
|
@@ -50,11 +83,10 @@ NSOperationQueueWrapper::NSOperationQueueWrapper(bool currentQueue) {
|
|
|
50
83
|
|
|
51
84
|
operationQueue = (void*)ptr;
|
|
52
85
|
}else {
|
|
53
|
-
NSOperationQueueWrapperObjC* objcWrapper = [[NSOperationQueueWrapperObjC alloc]
|
|
86
|
+
NSOperationQueueWrapperObjC* objcWrapper = [[NSOperationQueueWrapperObjC alloc] initWithSerial: serial];
|
|
54
87
|
CFTypeRef ptr = (__bridge_retained CFTypeRef)objcWrapper;
|
|
55
88
|
operationQueue = (void*)ptr;
|
|
56
89
|
}
|
|
57
|
-
|
|
58
90
|
}
|
|
59
91
|
|
|
60
92
|
NSOperationQueueWrapper::~NSOperationQueueWrapper() {
|
|
@@ -0,0 +1,214 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Created by Osei Fortune on 05/08/2024.
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
#pragma once
|
|
6
|
+
|
|
7
|
+
#include "Common.h"
|
|
8
|
+
|
|
9
|
+
#ifdef __ANDROID__
|
|
10
|
+
|
|
11
|
+
#include <android/looper.h>
|
|
12
|
+
#include <cassert>
|
|
13
|
+
|
|
14
|
+
#endif
|
|
15
|
+
|
|
16
|
+
#ifdef __APPLE__
|
|
17
|
+
#include "NSOperationQueueWrapper.h"
|
|
18
|
+
#endif
|
|
19
|
+
|
|
20
|
+
#include <unistd.h>
|
|
21
|
+
#include <fcntl.h>
|
|
22
|
+
#include <thread>
|
|
23
|
+
|
|
24
|
+
typedef void(*CompleteCallback)(bool success, void *data);
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
#ifdef __APPLE__
|
|
28
|
+
struct AsyncCallback {
|
|
29
|
+
|
|
30
|
+
struct Inner {
|
|
31
|
+
NSOperationQueueWrapper* current_queue = nullptr;
|
|
32
|
+
v8::Isolate *isolate_;
|
|
33
|
+
v8::Persistent<v8::Function> callback_;
|
|
34
|
+
CompleteCallback completeCallback_;
|
|
35
|
+
CompleteCallback completeCallbackWrapper_;
|
|
36
|
+
bool isPrepared_ = false;
|
|
37
|
+
void* data = nullptr;
|
|
38
|
+
|
|
39
|
+
Inner(v8::Isolate *isolate, v8::Local<v8::Function> callback,
|
|
40
|
+
CompleteCallback completeCallback) : isolate_(isolate),
|
|
41
|
+
callback_(v8::Persistent<v8::Function>(
|
|
42
|
+
isolate,
|
|
43
|
+
callback)) {
|
|
44
|
+
this->completeCallback_ = completeCallback;
|
|
45
|
+
|
|
46
|
+
this->completeCallbackWrapper_ = [](bool success, void *data){
|
|
47
|
+
if(data != nullptr){
|
|
48
|
+
auto* callback = static_cast<AsyncCallback*>(data);
|
|
49
|
+
if(callback->inner_->current_queue == nullptr){
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
auto inner = std::shared_ptr<Inner>(callback->inner_);
|
|
54
|
+
|
|
55
|
+
std::thread thread([success, data, callback](std::shared_ptr<Inner> inner){
|
|
56
|
+
inner->current_queue = nullptr;
|
|
57
|
+
inner->completeCallback_(success, data);
|
|
58
|
+
}, std::move(inner));
|
|
59
|
+
|
|
60
|
+
thread.detach();
|
|
61
|
+
|
|
62
|
+
// callback->inner_->current_queue->addOperation([success, data, callback, inner_ptr](){
|
|
63
|
+
// inner_ptr->completeCallback_(success, data);
|
|
64
|
+
// // delete callback;
|
|
65
|
+
// });
|
|
66
|
+
}
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
void prepare(){
|
|
71
|
+
current_queue = new NSOperationQueueWrapper(true);
|
|
72
|
+
isPrepared_ = true;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
void execute(bool complete, AsyncCallback* callback){
|
|
76
|
+
completeCallbackWrapper_(complete, callback);
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
~Inner() {
|
|
80
|
+
callback_.Reset();
|
|
81
|
+
}
|
|
82
|
+
};
|
|
83
|
+
|
|
84
|
+
std::shared_ptr<Inner> inner_;
|
|
85
|
+
|
|
86
|
+
|
|
87
|
+
void prepare(){
|
|
88
|
+
auto inner = this->inner_.get();
|
|
89
|
+
if(inner == nullptr){return;}
|
|
90
|
+
inner->prepare();
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
void execute(bool complete) {
|
|
94
|
+
auto inner = this->inner_.get();
|
|
95
|
+
if (inner == nullptr) { return; }
|
|
96
|
+
inner->execute(complete, this);
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
|
|
100
|
+
explicit AsyncCallback(std::shared_ptr<Inner> inner) : inner_(std::move(inner)) {}
|
|
101
|
+
|
|
102
|
+
|
|
103
|
+
AsyncCallback(v8::Isolate *isolate, v8::Local<v8::Function> callback,
|
|
104
|
+
CompleteCallback completeCallback) : inner_(
|
|
105
|
+
std::make_shared<Inner>(isolate, callback, completeCallback)) {
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
|
|
109
|
+
};
|
|
110
|
+
#endif
|
|
111
|
+
|
|
112
|
+
#ifdef __ANDROID__
|
|
113
|
+
|
|
114
|
+
struct AsyncCallback {
|
|
115
|
+
|
|
116
|
+
struct Inner {
|
|
117
|
+
int fd_[2];
|
|
118
|
+
ALooper *looper_;
|
|
119
|
+
v8::Isolate *isolate_;
|
|
120
|
+
v8::Persistent<v8::Function> callback_;
|
|
121
|
+
CompleteCallback completeCallback_;
|
|
122
|
+
bool isPrepared_ = false;
|
|
123
|
+
void* data;
|
|
124
|
+
|
|
125
|
+
Inner(v8::Isolate *isolate, v8::Local<v8::Function> callback,
|
|
126
|
+
CompleteCallback completeCallback) : isolate_(isolate),
|
|
127
|
+
callback_(v8::Persistent<v8::Function>(
|
|
128
|
+
isolate,
|
|
129
|
+
callback)) {
|
|
130
|
+
this->completeCallback_ = completeCallback;
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
void prepare() {
|
|
134
|
+
// release previous looper
|
|
135
|
+
if (isPrepared_) {
|
|
136
|
+
ALooper_removeFd(looper_, fd_[0]);
|
|
137
|
+
close(fd_[0]);
|
|
138
|
+
fd_[0] = -1;
|
|
139
|
+
fd_[1] = -1;
|
|
140
|
+
ALooper_release(looper_);
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
auto res = pipe(fd_);
|
|
144
|
+
assert(res != -1);
|
|
145
|
+
res = fcntl(fd_[1], F_SETFL, O_NONBLOCK);
|
|
146
|
+
assert(res != -1);
|
|
147
|
+
looper_ = ALooper_prepare(0);
|
|
148
|
+
ALooper_acquire(looper_);
|
|
149
|
+
|
|
150
|
+
isPrepared_ = true;
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
void execute(bool complete) const {
|
|
154
|
+
if (!isPrepared_) { return; }
|
|
155
|
+
write(fd_[1],
|
|
156
|
+
&complete,
|
|
157
|
+
sizeof(bool));
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
~Inner() {
|
|
161
|
+
if(!isPrepared_){
|
|
162
|
+
return;
|
|
163
|
+
}
|
|
164
|
+
ALooper_removeFd(looper_, fd_[0]);
|
|
165
|
+
close(fd_[0]);
|
|
166
|
+
ALooper_release(looper_);
|
|
167
|
+
callback_.Reset();
|
|
168
|
+
}
|
|
169
|
+
};
|
|
170
|
+
|
|
171
|
+
std::shared_ptr<Inner> inner_;
|
|
172
|
+
|
|
173
|
+
void prepare() const {
|
|
174
|
+
auto inner = this->inner_.get();
|
|
175
|
+
if (inner == nullptr) { return; }
|
|
176
|
+
inner->prepare();
|
|
177
|
+
auto looper = inner->looper_;
|
|
178
|
+
auto fd = inner->fd_[0];
|
|
179
|
+
|
|
180
|
+
auto data = new AsyncCallback(this->inner_);
|
|
181
|
+
ALooper_addFd(looper,
|
|
182
|
+
fd,
|
|
183
|
+
0,
|
|
184
|
+
ALOOPER_EVENT_INPUT,
|
|
185
|
+
[](int fd, int events,
|
|
186
|
+
void *data) {
|
|
187
|
+
auto cb = static_cast<AsyncCallback *>(data);
|
|
188
|
+
bool done = false;
|
|
189
|
+
read(fd, &done,
|
|
190
|
+
sizeof(bool));
|
|
191
|
+
cb->inner_->completeCallback_(done, data);
|
|
192
|
+
return 0;
|
|
193
|
+
}, (void *) data);
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
void execute(bool complete) const {
|
|
197
|
+
auto inner = this->inner_.get();
|
|
198
|
+
if (inner == nullptr) { return; }
|
|
199
|
+
inner->execute(complete);
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
|
|
203
|
+
explicit AsyncCallback(std::shared_ptr<Inner> inner) : inner_(std::move(inner)) {}
|
|
204
|
+
|
|
205
|
+
|
|
206
|
+
AsyncCallback(v8::Isolate *isolate, v8::Local<v8::Function> callback,
|
|
207
|
+
CompleteCallback completeCallback) : inner_(
|
|
208
|
+
std::make_shared<Inner>(isolate, callback, completeCallback)) {
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
|
|
212
|
+
};
|
|
213
|
+
|
|
214
|
+
#endif
|