react-native-wgpu 0.2.10 → 0.3.1

package/cpp/rnwgpu/api/GPUAdapter.cpp

@@ -10,25 +10,25 @@
 #include "Convertors.h"
 
 #include "GPUFeatures.h"
+#include "RNFJSIConverter.h"
 #include "WGPULogger.h"
 
 namespace rnwgpu {
 
-std::future<std::shared_ptr<GPUDevice>> GPUAdapter::requestDevice(
+async::AsyncTaskHandle GPUAdapter::requestDevice(
     std::optional<std::shared_ptr<GPUDeviceDescriptor>> descriptor) {
-  std::promise<std::shared_ptr<GPUDevice>> promise;
-  auto future = promise.get_future();
-  wgpu::Device device = nullptr;
   wgpu::DeviceDescriptor aDescriptor;
   Convertor conv;
   if (!conv(aDescriptor, descriptor)) {
     throw std::runtime_error("Failed to convert GPUDeviceDescriptor");
   }
+  auto deviceLostBinding = std::make_shared<std::weak_ptr<GPUDevice>>();
   // Set device lost callback using new template API
   aDescriptor.SetDeviceLostCallback(
       wgpu::CallbackMode::AllowSpontaneous,
-      [](const wgpu::Device &device, wgpu::DeviceLostReason reason,
-         wgpu::StringView message) {
+      [deviceLostBinding](const wgpu::Device & /*device*/,
+                          wgpu::DeviceLostReason reason,
+                          wgpu::StringView message) {
         const char *lostReason = "";
         switch (reason) {
         case wgpu::DeviceLostReason::Destroyed:
@@ -40,8 +40,13 @@ std::future<std::shared_ptr<GPUDevice>> GPUAdapter::requestDevice(
         default:
           lostReason = "Unknown";
         }
+        std::string msg =
+            message.length ? std::string(message.data, message.length) : "";
         Logger::logToConsole("GPU Device Lost (%s): %s", lostReason,
-                             message.data);
+                             msg.c_str());
+        if (auto deviceHost = deviceLostBinding->lock()) {
+          deviceHost->notifyDeviceLost(reason, std::move(msg));
+        }
       });
 
   // Set uncaptured error callback using new template API
@@ -71,55 +76,75 @@ std::future<std::shared_ptr<GPUDevice>> GPUAdapter::requestDevice(
                            : "no message";
     fprintf(stderr, "%s", fullMessage.c_str());
   });
-  _instance.RequestDevice(
-      &aDescriptor, wgpu::CallbackMode::AllowSpontaneous,
-      [](wgpu::RequestDeviceStatus status, wgpu::Device device,
-         wgpu::StringView message, wgpu::Device *userdata) {
-        if (message.length) {
-          fprintf(stderr, "%s", message.data);
-          return;
-        }
-        if (status == wgpu::RequestDeviceStatus::Success) {
-          *userdata = std::move(device);
-        }
-      },
-      &device);
-
-  if (!device) {
-    throw std::runtime_error("Failed to request device");
-  }
-  device.SetLoggingCallback(
-      [creationRuntime = _creationRuntime](wgpu::LoggingType type,
-                                           wgpu::StringView message) {
-        const char *logLevel = "";
-        switch (type) {
-        case wgpu::LoggingType::Warning:
-          logLevel = "Warning";
-          Logger::warnToJavascriptConsole(
-              *creationRuntime, std::string(message.data, message.length));
-          break;
-        case wgpu::LoggingType::Error:
-          logLevel = "Error";
-          Logger::errorToJavascriptConsole(
-              *creationRuntime, std::string(message.data, message.length));
-          break;
-        case wgpu::LoggingType::Verbose:
-          logLevel = "Verbose";
-          break;
-        case wgpu::LoggingType::Info:
-          logLevel = "Info";
-          break;
-        default:
-          logLevel = "Unknown";
-          Logger::logToConsole("%s: %.*s", logLevel,
-                               static_cast<int>(message.length), message.data);
-        }
-      });
   std::string label =
       descriptor.has_value() ? descriptor.value()->label.value_or("") : "";
-  promise.set_value(
-      std::make_shared<GPUDevice>(std::move(device), _async, label));
-  return future;
+
+  auto creationRuntime = getCreationRuntime();
+  return _async->postTask(
+      [this, aDescriptor, descriptor, label = std::move(label),
+       deviceLostBinding,
+       creationRuntime](const async::AsyncTaskHandle::ResolveFunction &resolve,
+                        const async::AsyncTaskHandle::RejectFunction &reject) {
+        (void)descriptor;
+        _instance.RequestDevice(
+            &aDescriptor, wgpu::CallbackMode::AllowProcessEvents,
+            [asyncRunner = _async, resolve, reject, label, creationRuntime,
+             deviceLostBinding](wgpu::RequestDeviceStatus status,
+                                wgpu::Device device,
+                                wgpu::StringView message) mutable {
+              if (message.length) {
+                fprintf(stderr, "%s", message.data);
+              }
+
+              if (status != wgpu::RequestDeviceStatus::Success || !device) {
+                std::string error =
+                    message.length ? std::string(message.data, message.length)
+                                   : "Failed to request device";
+                reject(std::move(error));
+                return;
+              }
+
+              device.SetLoggingCallback([creationRuntime](
+                                            wgpu::LoggingType type,
+                                            wgpu::StringView msg) {
+                if (creationRuntime == nullptr) {
+                  return;
+                }
+                const char *logLevel = "";
+                switch (type) {
+                case wgpu::LoggingType::Warning:
+                  logLevel = "Warning";
+                  Logger::warnToJavascriptConsole(
+                      *creationRuntime, std::string(msg.data, msg.length));
+                  break;
+                case wgpu::LoggingType::Error:
+                  logLevel = "Error";
+                  Logger::errorToJavascriptConsole(
+                      *creationRuntime, std::string(msg.data, msg.length));
+                  break;
+                case wgpu::LoggingType::Verbose:
+                  logLevel = "Verbose";
+                  break;
+                case wgpu::LoggingType::Info:
+                  logLevel = "Info";
+                  break;
+                default:
+                  logLevel = "Unknown";
+                  Logger::logToConsole("%s: %.*s", logLevel,
+                                       static_cast<int>(msg.length), msg.data);
+                }
+              });
+
+              auto deviceHost = std::make_shared<GPUDevice>(std::move(device),
+                                                            asyncRunner, label);
+              *deviceLostBinding = deviceHost;
+              resolve([deviceHost = std::move(deviceHost)](
+                          jsi::Runtime &runtime) mutable {
+                return margelo::JSIConverter<std::shared_ptr<GPUDevice>>::toJSI(
+                    runtime, deviceHost);
+              });
+            });
+      });
 }
 
 std::unordered_set<std::string> GPUAdapter::getFeatures() {

package/cpp/rnwgpu/api/GPUAdapter.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <future>
 #include <memory>
 #include <string>
 #include <unordered_set>
@@ -9,7 +8,8 @@
 
 #include "RNFHybridObject.h"
 
-#include "AsyncRunner.h"
+#include "rnwgpu/async/AsyncRunner.h"
+#include "rnwgpu/async/AsyncTaskHandle.h"
 
 #include "webgpu/webgpu_cpp.h"
 
@@ -25,13 +25,13 @@ namespace m = margelo;
 class GPUAdapter : public m::HybridObject {
 public:
   explicit GPUAdapter(wgpu::Adapter instance,
-                      std::shared_ptr<AsyncRunner> async)
+                      std::shared_ptr<async::AsyncRunner> async)
       : HybridObject("GPUAdapter"), _instance(instance), _async(async) {}
 
 public:
   std::string getBrand() { return _name; }
 
-  std::future<std::shared_ptr<GPUDevice>>
+  async::AsyncTaskHandle
   requestDevice(std::optional<std::shared_ptr<GPUDeviceDescriptor>> descriptor);
 
   std::unordered_set<std::string> getFeatures();
@@ -50,7 +50,7 @@ public:
 
 private:
   wgpu::Adapter _instance;
-  std::shared_ptr<AsyncRunner> _async;
+  std::shared_ptr<async::AsyncRunner> _async;
 };
 
-} // namespace rnwgpu
+} // namespace rnwgpu

package/cpp/rnwgpu/api/GPUAdapterInfo.h

@@ -7,7 +7,6 @@
 
 #include "RNFHybridObject.h"
 
-#include "AsyncRunner.h"
 #include "Convertors.h"
 
 #include "webgpu/webgpu_cpp.h"

package/cpp/rnwgpu/api/GPUBindGroup.h

@@ -6,8 +6,6 @@
 
 #include "RNFHybridObject.h"
 
-#include "AsyncRunner.h"
-
 #include "webgpu/webgpu_cpp.h"
 
 namespace rnwgpu {
@@ -49,4 +47,4 @@ private:
   std::string _label;
 };
 
-} // namespace rnwgpu
+} // namespace rnwgpu

package/cpp/rnwgpu/api/GPUBindGroupLayout.h

@@ -6,8 +6,6 @@
 
 #include "RNFHybridObject.h"
 
-#include "AsyncRunner.h"
-
 #include "webgpu/webgpu_cpp.h"
 
 namespace rnwgpu {
@@ -50,4 +48,4 @@ private:
   std::string _label;
 };
 
-} // namespace rnwgpu
+} // namespace rnwgpu

package/cpp/rnwgpu/api/GPUBuffer.cpp

@@ -37,9 +37,9 @@ GPUBuffer::getMappedRange(std::optional<size_t> o, std::optional<size_t> size) {
 
 void GPUBuffer::destroy() { _instance.Destroy(); }
 
-std::future<void> GPUBuffer::mapAsync(uint64_t modeIn,
-                                      std::optional<uint64_t> offset,
-                                      std::optional<uint64_t> size) {
+async::AsyncTaskHandle GPUBuffer::mapAsync(uint64_t modeIn,
+                                           std::optional<uint64_t> offset,
+                                           std::optional<uint64_t> size) {
   Convertor conv;
   wgpu::MapMode mode;
   if (!conv(mode, modeIn)) {
@@ -48,35 +48,38 @@ std::future<void> GPUBuffer::mapAsync(uint64_t modeIn,
   uint64_t rangeSize = size.has_value()
                            ? size.value()
                            : (_instance.GetSize() - offset.value_or(0));
-  return _async->runAsync([=] {
-    // for (auto& mapping : mappings) {
-    //   if (mapping.Intersects(start, end)) {
-    //     promise.set_exception(std::make_exception_ptr(std::runtime_error("Buffer
-    //     is already mapped"))); return future;
-    //   }
-    // }
-    return _instance.MapAsync(
-        mode, offset.value_or(0), rangeSize, wgpu::CallbackMode::WaitAnyOnly,
-        [](wgpu::MapAsyncStatus status, wgpu::StringView message) {
-          switch (status) {
-          case wgpu::MapAsyncStatus::Success:
-            break;
-          case wgpu::MapAsyncStatus::CallbackCancelled:
-            throw std::runtime_error("MapAsyncStatus::CallbackCancelled");
-            break;
-          case wgpu::MapAsyncStatus::Error:
-            throw std::runtime_error("MapAsyncStatus::Error");
-            break;
-          case wgpu::MapAsyncStatus::Aborted:
-            throw std::runtime_error("MapAsyncStatus::Aborted");
-            break;
-          default:
-            throw std::runtime_error("MapAsyncStatus: " +
-                                     std::to_string(static_cast<int>(status)));
-            break;
-          }
-        });
-  });
+  auto bufferHandle = _instance;
+  uint64_t resolvedOffset = offset.value_or(0);
+
+  return _async->postTask(
+      [bufferHandle, mode, resolvedOffset,
+       rangeSize](const async::AsyncTaskHandle::ResolveFunction &resolve,
+                  const async::AsyncTaskHandle::RejectFunction &reject) {
+        bufferHandle.MapAsync(mode, resolvedOffset, rangeSize,
+                              wgpu::CallbackMode::AllowProcessEvents,
+                              [resolve, reject](wgpu::MapAsyncStatus status,
+                                                wgpu::StringView message) {
+                                switch (status) {
+                                case wgpu::MapAsyncStatus::Success:
+                                  resolve(nullptr);
+                                  break;
+                                case wgpu::MapAsyncStatus::CallbackCancelled:
+                                  reject("MapAsyncStatus::CallbackCancelled");
+                                  break;
+                                case wgpu::MapAsyncStatus::Error:
+                                  reject("MapAsyncStatus::Error");
+                                  break;
+                                case wgpu::MapAsyncStatus::Aborted:
+                                  reject("MapAsyncStatus::Aborted");
+                                  break;
+                                default:
+                                  reject(
+                                      "MapAsyncStatus: " +
+                                      std::to_string(static_cast<int>(status)));
+                                  break;
+                                }
+                              });
+      });
 }
 
 void GPUBuffer::unmap() { _instance.Unmap(); }

package/cpp/rnwgpu/api/GPUBuffer.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <future>
 #include <memory>
 #include <optional>
 #include <string>
@@ -10,7 +9,8 @@
 
 #include "RNFHybridObject.h"
 
-#include "AsyncRunner.h"
+#include "rnwgpu/async/AsyncRunner.h"
+#include "rnwgpu/async/AsyncTaskHandle.h"
 
 #include "webgpu/webgpu_cpp.h"
 
@@ -22,7 +22,8 @@ namespace m = margelo;
 
 class GPUBuffer : public m::HybridObject {
 public:
-  explicit GPUBuffer(wgpu::Buffer instance, std::shared_ptr<AsyncRunner> async,
+  explicit GPUBuffer(wgpu::Buffer instance,
+                     std::shared_ptr<async::AsyncRunner> async,
                      std::string label)
       : HybridObject("GPUBuffer"), _instance(instance), _async(async),
         _label(label) {}
@@ -30,8 +31,9 @@ public:
 public:
   std::string getBrand() { return _name; }
 
-  std::future<void> mapAsync(uint64_t modeIn, std::optional<uint64_t> offset,
-                             std::optional<uint64_t> size);
+  async::AsyncTaskHandle mapAsync(uint64_t modeIn,
+                                  std::optional<uint64_t> offset,
+                                  std::optional<uint64_t> size);
   std::shared_ptr<ArrayBuffer> getMappedRange(std::optional<size_t> offset,
                                               std::optional<size_t> size);
   void unmap();
@@ -66,7 +68,7 @@ public:
 
 private:
   wgpu::Buffer _instance;
-  std::shared_ptr<AsyncRunner> _async;
+  std::shared_ptr<async::AsyncRunner> _async;
   std::string _label;
   struct Mapping {
     uint64_t start;
@@ -79,4 +81,4 @@ private:
   std::vector<Mapping> mappings;
 };
 
-} // namespace rnwgpu
+} // namespace rnwgpu

package/cpp/rnwgpu/api/GPUCanvasContext.cpp

@@ -4,7 +4,11 @@
 #include <memory>
 
 #ifdef __APPLE__
-#include "dawn/native/MetalBackend.h"
+namespace dawn::native::metal {
+
+void WaitForCommandsToBeScheduled(WGPUDevice device);
+
+}
 #endif
 
 namespace rnwgpu {

package/cpp/rnwgpu/api/GPUCanvasContext.h

@@ -10,8 +10,6 @@
 
 #include "RNFHybridObject.h"
 
-#include "AsyncRunner.h"
-
 #include "Canvas.h"
 #include "GPU.h"
 #include "GPUCanvasConfiguration.h"

package/cpp/rnwgpu/api/GPUCommandBuffer.h

@@ -6,8 +6,6 @@
 
 #include "RNFHybridObject.h"
 
-#include "AsyncRunner.h"
-
 #include "webgpu/webgpu_cpp.h"
 
 namespace rnwgpu {
@@ -42,4 +40,4 @@ private:
   std::string _label;
 };
 
-} // namespace rnwgpu
+} // namespace rnwgpu

package/cpp/rnwgpu/api/GPUCommandEncoder.h

@@ -7,8 +7,6 @@
 
 #include "RNFHybridObject.h"
 
-#include "AsyncRunner.h"
-
 #include "webgpu/webgpu_cpp.h"
 
 #include "GPUBuffer.h"
@@ -107,4 +105,4 @@ private:
   std::string _label;
 };
 
-} // namespace rnwgpu
+} // namespace rnwgpu

package/cpp/rnwgpu/api/GPUCompilationInfo.h

@@ -7,8 +7,6 @@
 
 #include "RNFHybridObject.h"
 
-#include "AsyncRunner.h"
-
 #include "webgpu/webgpu_cpp.h"
 
 namespace rnwgpu {

package/cpp/rnwgpu/api/GPUCompilationMessage.h

@@ -6,8 +6,6 @@
 
 #include "RNFHybridObject.h"
 
-#include "AsyncRunner.h"
-
 #include "webgpu/webgpu_cpp.h"
 
 namespace rnwgpu {
@@ -32,4 +30,4 @@ private:
   wgpu::CompilationMessage _instance;
 };
 
-} // namespace rnwgpu
+} // namespace rnwgpu

package/cpp/rnwgpu/api/GPUComputePassEncoder.h

@@ -10,8 +10,6 @@
 
 #include "RNFHybridObject.h"
 
-#include "AsyncRunner.h"
-
 #include "webgpu/webgpu_cpp.h"
 
 #include "GPUBindGroup.h"
@@ -83,4 +81,4 @@ private:
   std::string _label;
 };
 
-} // namespace rnwgpu
+} // namespace rnwgpu

package/cpp/rnwgpu/api/GPUComputePipeline.h

@@ -7,8 +7,6 @@
 
 #include "RNFHybridObject.h"
 
-#include "AsyncRunner.h"
-
 #include "webgpu/webgpu_cpp.h"
 
 #include "GPUBindGroupLayout.h"
@@ -58,4 +56,4 @@ private:
   friend class GPUDevice;
 };
 
-} // namespace rnwgpu
+} // namespace rnwgpu