react-native-wgpu 0.1.19 → 0.1.20

package/cpp/rnwgpu/api/GPU.h

@@ -58,4 +58,4 @@ private:
   std::shared_ptr<AsyncRunner> _async;
 };
 
-} // namespace rnwgpu
+} // namespace rnwgpu

package/cpp/rnwgpu/api/GPUCanvasContext.cpp

@@ -2,6 +2,10 @@
 #include "Convertors.h"
 #include "RNWebGPUManager.h"
 
+#ifdef __APPLE__
+#include "dawn/native/MetalBackend.h"
+#endif
+
 namespace rnwgpu {
 
 void GPUCanvasContext::configure(

package/cpp/rnwgpu/api/GPUCanvasContext.h

@@ -17,22 +17,6 @@
 #include "GPUTexture.h"
 #include "SurfaceRegistry.h"
 
-#ifdef __APPLE__
-
-namespace dawn {
-namespace native {
-namespace metal {
-
-// See
-// https://source.chromium.org/chromium/chromium/src/+/main:third_party/dawn/include/dawn/native/MetalBackend.h;l=41
-void WaitForCommandsToBeScheduled(WGPUDevice device);
-
-} // namespace metal
-} // namespace native
-} // namespace dawn
-
-#endif
-
 namespace rnwgpu {
 
 namespace m = margelo;

package/cpp/webgpu/webgpu_glfw.h

@@ -0,0 +1,71 @@
+// Copyright 2022 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_WEBGPU_WEBGPU_GLFW_H_
+#define INCLUDE_WEBGPU_WEBGPU_GLFW_H_
+
+#include <memory>
+
+#include "webgpu/webgpu_cpp.h"
+
+#if defined(WGPU_GLFW_SHARED_LIBRARY)
+#if defined(_WIN32)
+#if defined(WGPU_GLFW_IMPLEMENTATION)
+#define WGPU_GLFW_EXPORT __declspec(dllexport)
+#else
+#define WGPU_GLFW_EXPORT __declspec(dllimport)
+#endif
+#else  // defined(_WIN32)
+#if defined(WGPU_GLFW_IMPLEMENTATION)
+#define WGPU_GLFW_EXPORT __attribute__((visibility("default")))
+#else
+#define WGPU_GLFW_EXPORT
+#endif
+#endif  // defined(_WIN32)
+#else   // defined(WGPU_GLFW_SHARED_LIBRARY)
+#define WGPU_GLFW_EXPORT
+#endif  // defined(WGPU_GLFW_SHARED_LIBRARY)
+
+struct GLFWwindow;
+
+namespace wgpu::glfw {
+
+// Does the necessary setup on the GLFWwindow to allow creating a wgpu::Surface with it and
+// calls `instance.CreateSurface` with the correct descriptor for this window.
+// Returns a null wgpu::Surface on failure.
+WGPU_GLFW_EXPORT wgpu::Surface CreateSurfaceForWindow(const wgpu::Instance& instance,
+                                                      GLFWwindow* window);
+
+// Use for testing only. Does everything that CreateSurfaceForWindow does except the call to
+// CreateSurface. Useful to be able to modify the descriptor for testing, or when trying to
+// avoid using the global proc table.
+WGPU_GLFW_EXPORT std::unique_ptr<wgpu::ChainedStruct, void (*)(wgpu::ChainedStruct*)>
+SetupWindowAndGetSurfaceDescriptor(GLFWwindow* window);
+
+}  // namespace wgpu::glfw
+
+#endif  // INCLUDE_WEBGPU_WEBGPU_GLFW_H_

package/libs/apple/libwebgpu_dawn.xcframework/Info.plist

@@ -8,36 +8,38 @@
 			<key>BinaryPath</key>
 			<string>libwebgpu_dawn.a</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>xros-arm64</string>
 			<key>LibraryPath</key>
 			<string>libwebgpu_dawn.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>xros</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libwebgpu_dawn.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libwebgpu_dawn.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libwebgpu_dawn.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>libwebgpu_dawn.a</string>
 			<key>SupportedArchitectures</key>
@@ -46,15 +48,13 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>macos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libwebgpu_dawn.a</string>
 			<key>LibraryIdentifier</key>
-			<string>xros-arm64</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libwebgpu_dawn.a</string>
 			<key>SupportedArchitectures</key>
@@ -62,7 +62,7 @@
 				<string>arm64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>xros</string>
+			<string>ios</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-wgpu",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "React Native WebGPU",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -26,6 +26,7 @@
     "tsc": "tsc --noEmit",
     "build": "bob build",
     "build-dawn": "ts-node scripts/build/dawn.ts",
+    "copy-headers": "ts-node scripts/build/copy-headers.ts",
     "clean-dawn": "rimraf ./libs && rimraf ../../externals/dawn/out",
     "clang-format": "yarn clang-format-ios && yarn clang-format-android && yarn clang-format-common",
     "clang-format-ios": "find apple/ -iname \"*.h\" -o -iname \"*.mm\" -o -iname \"*.cpp\" | xargs clang-format -i",

package/react-native-wgpu.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => min_ios_version_supported, :visionos => "1.0" }
+  s.platforms    = { :ios => min_ios_version_supported, :osx => "10.15", :visionos => "1.0" }
   s.source       = { :git => "https://github.com/wcandillon/react-native-webgpu.git", :tag => "#{s.version}" }
 
   s.source_files = [

package/cpp/rnwgpu/api/WebGPUCanvasContextFactory.h

@@ -1,59 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "Unions.h"
-
-#include "webgpu/webgpu_cpp.h"
-
-#include "RNFHybridObject.h"
-
-#include "AsyncRunner.h"
-
-#include "GPUCanvasContext.h"
-
-#ifdef __APPLE__
-#include "WebGPUModule.h"
-#endif
-
-namespace rnwgpu {
-
-namespace m = margelo;
-
-class WebGPUCanvasContextFactory : public m::HybridObject {
-public:
-  GPUCanvasContextFactory() : HybridObject("GPUCanvasContextFactory") {}
-
-public:
-  std::shared_ptr<GPUCanvasContext> Make(uint64_t surface, int width,
-                                         int height) {
-#ifdef __APPLE__
-    wgpu::SurfaceDescriptorFromMetalLayer metalSurfaceDesc;
-    metalSurfaceDesc.layer = reinterpret_cast<void *>(surface);
-
-    wgpu::SurfaceDescriptor surfaceDescriptor;
-    surfaceDescriptor.nextInChain = &metalSurfaceDesc;
-
-    auto surfaceGpu = std::make_unique<wgpu::Surface>(
-        WebGPUModule::getManager()->getGPU()->get().CreateSurface(
-            &surfaceDescriptor));
-    const float scaleFactor = 1;
-    const float scaledWidth = width * scaleFactor;
-    const float scaledHeight = height * scaleFactor;
-
-    rnwgpu::SurfaceData surfaceData{scaledWidth, scaledHeight,
-                                    std::move(surfaceGpu)};
-#elif __ANDROID__
-    throw std::runtime_error("Not implemented");
-#endif
-    return std::make_shared<rnwgpu::GPUCanvasContext>(surfaceData);
-  }
-
-  void loadHybridMethods() override {
-    registerHybridGetter("Make", &GPUCanvasContextFactory::Make, this);
-  }
-};
-
-} // namespace rnwgpu