react-native-wgpu 0.1.18 → 0.1.20

package/android/build.gradle

@@ -47,7 +47,7 @@ static def findNodeModules(baseDir) {
     basePath = basePath.getParent()
   }
 
-  throw new GradleException("react-native-filament: Failed to find node_modules/ path!")
+  throw new GradleException("react-native-wgpu: Failed to find node_modules/ path!")
 }
 
 def nodeModules = findNodeModules(projectDir)

package/android/cpp/AndroidPlatformContext.h

@@ -34,7 +34,7 @@ public:
 
   wgpu::Surface makeSurface(wgpu::Instance instance, void *window, int width,
                             int height) override {
-    wgpu::SurfaceDescriptorFromAndroidNativeWindow androidSurfaceDesc;
+    wgpu::SurfaceSourceAndroidNativeWindow androidSurfaceDesc;
     androidSurfaceDesc.window = reinterpret_cast<ANativeWindow *>(window);
     wgpu::SurfaceDescriptor surfaceDescriptor;
     surfaceDescriptor.nextInChain = &androidSurfaceDesc;

package/android/src/main/java/com/webgpu/WebGPUAHBView.java

@@ -15,14 +15,12 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 
-import java.util.LinkedList;
-import java.util.Queue;
-
 @SuppressLint("ViewConstructor")
 @RequiresApi(api = Build.VERSION_CODES.Q)
-public class WebGPUAHBView extends View {
+public class WebGPUAHBView extends View implements ImageReader.OnImageAvailableListener {
+
+  private ImageReader mReader;
 
-  private final Queue<ImageReader> mImageReaders = new LinkedList<>();
   private Bitmap mBitmap = null;
 
   private final Matrix matrix = new Matrix();
@@ -34,48 +32,58 @@ public class WebGPUAHBView extends View {
     mApi = api;
   }
 
+  private ImageReader createReader() {
+    ImageReader reader = ImageReader.newInstance(getWidth(), getHeight(), PixelFormat.RGBA_8888, 2, HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE |
+      HardwareBuffer.USAGE_GPU_COLOR_OUTPUT);
+    reader.setOnImageAvailableListener(this, null);
+    return reader;
+  }
+
   @Override
   protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
     super.onLayout(changed, left, top, right, bottom);
-    long usage = HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE |
-      HardwareBuffer.USAGE_GPU_COLOR_OUTPUT;
-    ImageReader imageReader = ImageReader.newInstance(getWidth(), getHeight(), PixelFormat.RGBA_8888, 2, usage);
-    if (mImageReaders.isEmpty()) {
-      mApi.surfaceCreated(imageReader.getSurface());
+    if (mReader == null) {
+      mReader = createReader();
+      mApi.surfaceCreated(mReader.getSurface());
     } else {
-      mApi.surfaceChanged(imageReader.getSurface());
+      mApi.surfaceChanged(mReader.getSurface());
     }
-    imageReader.setOnImageAvailableListener(new ImageReader.OnImageAvailableListener() {
-      @Override
-      public void onImageAvailable(ImageReader reader) {
-        try (Image image = reader.acquireLatestImage()) {
-          if (image != null) {
-            HardwareBuffer hb = image.getHardwareBuffer();
-            if (hb != null) {
-              Bitmap bitmap = Bitmap.wrapHardwareBuffer(hb, null);
-              if (bitmap != null) {
-                mBitmap = bitmap;
-                hb.close();
-                invalidate();
-                ImageReader imageReader = mImageReaders.poll();
-                ImageReader ir;
-                while((ir = mImageReaders.poll()) != null) {
-                    ir.close();
-                }
-                mImageReaders.add(imageReader);
-              }
-            }
+  }
+
+  @Override
+  public void onImageAvailable(ImageReader reader) {
+    try (Image image = reader.acquireLatestImage()) {
+      if (image != null) {
+        HardwareBuffer hb = image.getHardwareBuffer();
+        if (hb != null) {
+          Bitmap bitmap = Bitmap.wrapHardwareBuffer(hb, null);
+          if (bitmap != null) {
+            mBitmap = bitmap;
+            hb.close();
+            invalidate();
           }
         }
       }
-    }, null);
-    mImageReaders.add(imageReader);
+    }
   }
 
   @Override
   protected void onDraw(@NonNull Canvas canvas) {
     super.onDraw(canvas);
     if (mBitmap != null) {
+      float viewWidth = getWidth();
+      float viewHeight = getHeight();
+      float bitmapWidth = mBitmap.getWidth();
+      float bitmapHeight = mBitmap.getHeight();
+
+      // Calculate the scale factors
+      float scaleX = viewWidth / bitmapWidth;
+      float scaleY = viewHeight / bitmapHeight;
+
+      // Reset the matrix and apply scaling
+      matrix.reset();
+      matrix.setScale(scaleX, scaleY);
+
       canvas.drawBitmap(mBitmap, matrix, null);
     }
   }

package/android/src/main/java/com/webgpu/{SurfaceView2.java → WebGPUSurfaceViewWithSC.java}

@@ -15,13 +15,13 @@ import androidx.annotation.RequiresApi;
 
 @SuppressLint("ViewConstructor")
 @RequiresApi(api = Build.VERSION_CODES.Q)
-public class SurfaceView2 extends SurfaceView implements SurfaceHolder.Callback {
+public class WebGPUSurfaceViewWithSC extends SurfaceView implements SurfaceHolder.Callback {
 
   WebGPUAPI mApi;
   SurfaceControl mSurfaceControl;
   Surface mSurface;
 
-  public SurfaceView2(Context context, WebGPUAPI api) {
+  public WebGPUSurfaceViewWithSC(Context context, WebGPUAPI api) {
     super(context);
     mApi = api;
     getHolder().addCallback(this);
@@ -48,7 +48,7 @@ public class SurfaceView2 extends SurfaceView implements SurfaceHolder.Callback
     } else {
       SurfaceControl.Builder scb = new SurfaceControl.Builder();
       scb.setName("WebGPUView");
-      scb.setOpaque(false);
+      scb.setOpaque(true);
       scb.setBufferSize(getWidth(), getHeight());
       scb.setParent(getSurfaceControl());
       scb.setFormat(PixelFormat.RGBA_8888);

package/android/src/main/java/com/webgpu/WebGPUView.java

@@ -5,37 +5,17 @@ import android.os.Build;
 import android.view.Surface;
 import android.view.View;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringDef;
-
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.views.view.ReactViewGroup;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
 public class WebGPUView extends ReactViewGroup implements WebGPUAPI {
 
-  public static final String SURFACE_VIEW = "SurfaceView";
-  public static final String TEXTURE_VIEW = "TextureView";
-  public static final String HARDWARE_BUFFER = "HardwareBuffer";
-  public static final String SURFACE_VIEW2 = "SurfaceView2";
-
-  @Retention(RetentionPolicy.SOURCE)
-  @StringDef({
-    SURFACE_VIEW,
-    TEXTURE_VIEW,
-    HARDWARE_BUFFER,
-    SURFACE_VIEW2
-  })
-  public @interface ViewType {}
 
   private int mContextId;
-  private @ViewType String mName = null;
+  private boolean mTransparent = false;
   private WebGPUModule mModule;
-  private View mView;
+  private View mView = null;
 
   WebGPUView(Context context) {
     super(context);
@@ -51,28 +31,21 @@ public class WebGPUView extends ReactViewGroup implements WebGPUAPI {
     mContextId = contextId;
   }
 
-  public void setView(@NonNull @ViewType String name) {
+  public void setTransparent(boolean value) {
     Context ctx = getContext();
-    if (mName == null || !mName.equals(name)) {
-      removeView(mView);
-      mName = name;
-      switch (name) {
-        case TEXTURE_VIEW -> mView = new WebGPUTextureView(ctx, this);
-        case HARDWARE_BUFFER -> {
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            mView = new WebGPUAHBView(ctx, this);
-          } else {
-            throw new RuntimeException("HardwareBuffer Canvas implementation is only available on API Level 29 and above");
-          }
-        }
-        case SURFACE_VIEW2 -> {
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            mView = new SurfaceView2(ctx, this);
-          } else {
-            throw new RuntimeException("HardwareBuffer Canvas implementation is only available on API Level 29 and above");
-          }
+    if (value != mTransparent || mView == null) {
+      if (mView != null) {
+        removeView(mView);
+      }
+      mTransparent = value;
+      if (mTransparent) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+          mView = new WebGPUAHBView(ctx, this);
+        } else {
+          mView = new WebGPUTextureView(ctx, this);
         }
-        default -> mView = new WebGPUSurfaceView(ctx, this);
+      } else {
+        mView = new WebGPUSurfaceView(ctx, this);
       }
       addView(mView);
     }

package/android/src/main/java/com/webgpu/WebGPUViewManager.java

@@ -25,9 +25,9 @@ public class WebGPUViewManager extends WebGPUViewManagerSpec<WebGPUView> {
   }
 
   @Override
-  @ReactProp(name = "androidView")
-  public void setAndroidView(WebGPUView view, @Nullable String value) {
-    view.setView(value == null ? WebGPUView.SURFACE_VIEW : value);
+  @ReactProp(name = "transparent")
+  public void setTransparent(WebGPUView view, boolean value) {
+    view.setTransparent(value);
   }
 
   @Override

package/android/src/oldarch/com/webgpu/WebGPUViewManagerSpec.java

@@ -8,5 +8,5 @@ import com.facebook.react.uimanager.SimpleViewManager;
 
 public abstract class WebGPUViewManagerSpec<T extends View> extends SimpleViewManager<T> {
   public abstract void setContextId(T view, int contextId);
-  public abstract void setAndroidView(T view, @Nullable String name);
+  public abstract void setTransparent(T view, boolean transparency);
 }

package/apple/ApplePlatformContext.mm

@@ -11,7 +11,7 @@
 
 namespace rnwgpu {
 
-void isSimulatorWithAPIValidation() {
+void checkIfUsingSimulatorWithAPIValidation() {
 #if TARGET_OS_SIMULATOR
   NSDictionary *environment = [[NSProcessInfo processInfo] environment];
   NSString *metalDeviceWrapperType = environment[@"METAL_DEVICE_WRAPPER_TYPE"];
@@ -25,12 +25,12 @@ void isSimulatorWithAPIValidation() {
 #endif
 }
 
-ApplePlatformContext::ApplePlatformContext() { isSimulatorWithAPIValidation(); }
+ApplePlatformContext::ApplePlatformContext() { checkIfUsingSimulatorWithAPIValidation(); }
 
 wgpu::Surface ApplePlatformContext::makeSurface(wgpu::Instance instance,
                                                 void *surface, int width,
                                                 int height) {
-  wgpu::SurfaceDescriptorFromMetalLayer metalSurfaceDesc;
+  wgpu::SurfaceSourceMetalLayer metalSurfaceDesc;
   metalSurfaceDesc.layer = surface;
   wgpu::SurfaceDescriptor surfaceDescriptor;
   surfaceDescriptor.nextInChain = &metalSurfaceDesc;
@@ -50,12 +50,20 @@ ImageData ApplePlatformContext::createImageBitmap(std::string blobId,
     throw std::runtime_error("Couldn't retrive blob data");
   }
 
+#if !TARGET_OS_OSX
   UIImage *image = [UIImage imageWithData:blobData];
+#else
+  NSImage *image = [[NSImage alloc] initWithData:blobData];
+#endif
   if (!image) {
     throw std::runtime_error("Couldn't decode image");
   }
 
+#if !TARGET_OS_OSX
   CGImageRef cgImage = image.CGImage;
+#else
+  CGImageRef cgImage = [image CGImageForProposedRect:NULL context:NULL hints:NULL];
+#endif
   size_t width = CGImageGetWidth(cgImage);
   size_t height = CGImageGetHeight(cgImage);
   size_t bitsPerComponent = 8;

package/apple/MetalView.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #import "WebGPUModule.h"
-#import <UIKit/UIKit.h>
+#import "RNWGUIKit.h"
 
-@interface MetalView : UIView
+@interface MetalView : RNWGPlatformView
 
 @property NSNumber *contextId;
 

package/apple/MetalView.mm

@@ -9,9 +9,21 @@
   BOOL _isConfigured;
 }
 
+#if !TARGET_OS_OSX
 + (Class)layerClass {
   return [CAMetalLayer class];
 }
+#else // !TARGET_OS_OSX
+- (instancetype)init
+{
+    self = [super init];
+    if (self) {
+        self.wantsLayer = true;
+        self.layer = [CAMetalLayer layer];
+    }
+    return self;
+}
+#endif // !TARGET_OS_OSX
 
 - (void)configure {
   auto size = self.frame.size;

package/apple/RNWGUIKit.h

@@ -0,0 +1,11 @@
+#if !TARGET_OS_OSX
+#import <UIKit/UIKit.h>
+#else
+#import <Appkit/Appkit.h>
+#endif
+
+#if !TARGET_OS_OSX
+typedef UIView RNWGPlatformView;
+#else
+typedef NSView RNWGPlatformView;
+#endif

package/apple/WebGPUModule.mm

@@ -46,19 +46,19 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
   }
   RCTCxxBridge *cxxBridge = (RCTCxxBridge *)[RCTBridge currentBridge];
   if (!cxxBridge.runtime) {
-    NSLog(@"Failed to install react-native-filament: RCTBridge is not a "
+    NSLog(@"Failed to install react-native-wgpu: RCTBridge is not a "
           @"RCTCxxBridge!");
     return [NSNumber numberWithBool:NO];
   }
 
   jsi::Runtime *runtime = (jsi::Runtime *)cxxBridge.runtime;
   if (!runtime) {
-    NSLog(@"Failed to install react-native-filament: jsi::Runtime* was null!");
+    NSLog(@"Failed to install react-native-wgpu: jsi::Runtime* was null!");
     return [NSNumber numberWithBool:NO];
   }
   std::shared_ptr<react::CallInvoker> jsInvoker = cxxBridge.jsCallInvoker;
   if (!jsInvoker) {
-    NSLog(@"Failed to install react-native-filament: react::CallInvoker was "
+    NSLog(@"Failed to install react-native-wgpu: react::CallInvoker was "
           @"null!");
     return [NSNumber numberWithBool:NO];
   }
@@ -74,15 +74,6 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
   return @true;
 }
 
-// RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(createSurfaceContext
-//                                        : (double)contextId) {
-//   int contextIdInt = contextId;
-//   RCTCxxBridge *cxxBridge = (RCTCxxBridge *)self.bridge;
-//   auto runtime = (jsi::Runtime *)cxxBridge.runtime;
-
-//   return @true;
-// }
-
 #ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params {

package/apple/WebGPUViewManager.mm

@@ -1,5 +1,6 @@
 #import "MetalView.h"
 #import "RCTBridge.h"
+#import "RNWGUIKit.h"
 #import "WebGPUModule.h"
 #import <React/RCTUIManager.h>
 #import <React/RCTViewManager.h>
@@ -11,11 +12,11 @@
 
 RCT_EXPORT_MODULE(WebGPUView)
 
-- (UIView *)view {
+- (RNWGPlatformView *)view {
   return [MetalView new];
 }
 
-RCT_CUSTOM_VIEW_PROPERTY(contextId, NSNumber, UIView) {
+RCT_CUSTOM_VIEW_PROPERTY(contextId, NSNumber, RNWGPlatformView) {
   NSNumber *contextId = [RCTConvert NSNumber:json];
   [(MetalView *)view setContextId:contextId];
 }

package/cpp/dawn/dawn_proc.h

@@ -0,0 +1,50 @@
+// Copyright 2019 The Dawn & Tint Authors
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this
+//    list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation
+//    and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its
+//    contributors may be used to endorse or promote products derived from
+//    this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef INCLUDE_DAWN_DAWN_PROC_H_
+#define INCLUDE_DAWN_DAWN_PROC_H_
+
+#include <webgpu/webgpu.h>
+
+#include "dawn/dawn_proc_table.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Sets the static proctable used by libdawn_proc to implement the Dawn entrypoints. Passing NULL
+// for `procs` sets up the null proctable that contains only null function pointers. It is the
+// default value of the proctable. Setting the proctable back to null is good practice when you
+// are done using libdawn_proc since further usage will cause a segfault instead of calling an
+// unexpected function.
+WGPU_EXPORT void dawnProcSetProcs(const DawnProcTable* procs);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // INCLUDE_DAWN_DAWN_PROC_H_