🔧

Author: wcandillon

packages/webgpu/android/CMakeLists.txt

@@ -44,8 +44,7 @@ add_library(${PACKAGE_NAME} SHARED
     ../cpp/rnwgpu/api/GPUComputePipeline.cpp
     ../cpp/rnwgpu/api/GPUCanvasContext.cpp
     ../cpp/rnwgpu/RNWebGPUManager.cpp
-    ../cpp/jsi/RNFPromise.cpp
-    ../cpp/jsi/RNFRuntimeState.cpp
+    ../cpp/jsi/Promise.cpp
     ../cpp/rnwgpu/async/AsyncRunner.cpp
     ../cpp/rnwgpu/async/AsyncTaskHandle.cpp
     ../cpp/rnwgpu/async/JSIMicrotaskDispatcher.cpp

packages/webgpu/cpp/jsi/RNFEnumMapper.h packages/webgpu/cpp/jsi/EnumMapper.hpackages/webgpu/cpp/jsi/RNFEnumMapper.h renamed to packages/webgpu/cpp/jsi/EnumMapper.h

@@ -1,13 +1,9 @@
-//
-// Created by Marc Rousavy on 22.02.24.
-//
-
 #pragma once
 
 #include <stdexcept>
 #include <string>
 
-namespace margelo {
+namespace rnwgpu {
 
 namespace EnumMapper {
   // Add these two methods in namespace "EnumMapper" to allow parsing a custom enum:
@@ -46,4 +42,4 @@ namespace EnumMapper {
   }
 } // namespace EnumMapper
 
-} // namespace margelo
+} // namespace rnwgpu

packages/webgpu/cpp/jsi/RNFJSIConverter.h packages/webgpu/cpp/jsi/JSIConverter.hpackages/webgpu/cpp/jsi/RNFJSIConverter.h renamed to packages/webgpu/cpp/jsi/JSIConverter.h

@@ -1,7 +1,3 @@
-//
-// Created by Marc Rousavy on 21.02.24.
-//
-
 #pragma once
 
 #include <memory>
@@ -16,8 +12,8 @@
 
 #include <jsi/jsi.h>
 
-#include "RNFEnumMapper.h"
-#include "RNFPromise.h"
+#include "EnumMapper.h"
+#include "Promise.h"
 
 #include "Unions.h"
 
@@ -30,7 +26,7 @@
 #include <cxxabi.h>
 #endif
 
-namespace margelo {
+namespace rnwgpu {
 
 namespace jsi = facebook::jsi;
 
@@ -208,8 +204,8 @@ template <> struct JSIConverter<rnwgpu::async::AsyncTaskHandle> {
   }
 
   static jsi::Value toJSI(jsi::Runtime& runtime, rnwgpu::async::AsyncTaskHandle&& handle) {
-    return Promise::createPromise(runtime, [handle = std::move(handle)](jsi::Runtime& runtime,
-                                                                        std::shared_ptr<Promise> promise) mutable {
+    return rnwgpu::Promise::createPromise(runtime, [handle = std::move(handle)](jsi::Runtime& runtime,
+                                                                        std::shared_ptr<rnwgpu::Promise> promise) mutable {
       if (!handle.valid()) {
         promise->resolve(jsi::Value::undefined());
         return;
@@ -466,4 +462,4 @@ struct JSIConverter<std::unordered_set<std::string>> {
   }
 };
 
-} // namespace margelo
+} // namespace rnwgpu

packages/webgpu/cpp/jsi/NativeObject.h

@@ -17,12 +17,12 @@
 #include "WGPULogger.h"
 
 // Forward declare to avoid circular dependency
-namespace margelo {
+namespace rnwgpu {
 template <typename ArgType, typename SFINAE> struct JSIConverter;
-} // namespace margelo
+} // namespace rnwgpu
 
 // Include the converter - must come after forward declaration
-#include "RNFJSIConverter.h"
+#include "JSIConverter.h"
 
 namespace rnwgpu {
 
@@ -272,7 +272,7 @@ class NativeObject : public jsi::NativeState,
             return jsi::Value::undefined();
           } else {
             ReturnType result = (native.get()->*getter)();
-            return margelo::JSIConverter<std::decay_t<ReturnType>>::toJSI(
+            return rnwgpu::JSIConverter<std::decay_t<ReturnType>>::toJSI(
                 rt, std::move(result));
           }
         });
@@ -305,7 +305,7 @@ class NativeObject : public jsi::NativeState,
                  const jsi::Value *args, size_t count) -> jsi::Value {
           auto native = Derived::fromValue(rt, thisVal);
           auto value =
-              margelo::JSIConverter<std::decay_t<ValueType>>::fromJSI(rt, args[0], false);
+              rnwgpu::JSIConverter<std::decay_t<ValueType>>::fromJSI(rt, args[0], false);
           (native.get()->*setter)(std::move(value));
           return jsi::Value::undefined();
         });
@@ -352,7 +352,7 @@ class NativeObject : public jsi::NativeState,
                  const jsi::Value *args, size_t count) -> jsi::Value {
           auto native = Derived::fromValue(rt, thisVal);
           ReturnType result = (native.get()->*getter)();
-          return margelo::JSIConverter<std::decay_t<ReturnType>>::toJSI(rt,
+          return rnwgpu::JSIConverter<std::decay_t<ReturnType>>::toJSI(rt,
                                                                std::move(result));
         });
 
@@ -363,7 +363,7 @@ class NativeObject : public jsi::NativeState,
                  const jsi::Value *args, size_t count) -> jsi::Value {
           auto native = Derived::fromValue(rt, thisVal);
           auto value =
-              margelo::JSIConverter<std::decay_t<ValueType>>::fromJSI(rt, args[0], false);
+              rnwgpu::JSIConverter<std::decay_t<ValueType>>::fromJSI(rt, args[0], false);
           (native.get()->*setter)(std::move(value));
           return jsi::Value::undefined();
         });
@@ -390,17 +390,17 @@ class NativeObject : public jsi::NativeState,
                                jsi::Runtime &runtime, const jsi::Value *args,
                                std::index_sequence<Is...>, size_t count) {
     if constexpr (std::is_same_v<ReturnType, void>) {
-      (obj->*method)(margelo::JSIConverter<std::decay_t<Args>>::fromJSI(
+      (obj->*method)(rnwgpu::JSIConverter<std::decay_t<Args>>::fromJSI(
           runtime, args[Is], Is >= count)...);
       return jsi::Value::undefined();
     } else if constexpr (std::is_same_v<ReturnType, jsi::Value>) {
       // Special case: if return type is jsi::Value, method has full control
       // This requires the method signature to match HostFunction
       return (obj->*method)(runtime, jsi::Value::undefined(), args, count);
     } else {
-      ReturnType result = (obj->*method)(margelo::JSIConverter<std::decay_t<Args>>::fromJSI(
+      ReturnType result = (obj->*method)(rnwgpu::JSIConverter<std::decay_t<Args>>::fromJSI(
           runtime, args[Is], Is >= count)...);
-      return margelo::JSIConverter<std::decay_t<ReturnType>>::toJSI(runtime,
+      return rnwgpu::JSIConverter<std::decay_t<ReturnType>>::toJSI(runtime,
                                                            std::move(result));
     }
   }

packages/webgpu/cpp/jsi/RNFPromise.cpp packages/webgpu/cpp/jsi/Promise.cpppackages/webgpu/cpp/jsi/RNFPromise.cpp renamed to packages/webgpu/cpp/jsi/Promise.cpp

@@ -1,15 +1,12 @@
-//
-// Created by Marc Rousavy on 22.02.24.
-//
-#include "RNFPromise.h"
+#include "Promise.h"
 #include <future>
 #include <jsi/jsi.h>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
-namespace margelo {
+namespace rnwgpu {
 
 namespace jsi = facebook::jsi;
 
@@ -44,4 +41,4 @@ void Promise::reject(std::string message) {
   _rejecter.call(runtime, error.value());
 }
 
-} // namespace margelo
+} // namespace rnwgpu

packages/webgpu/cpp/jsi/RNFPromise.h packages/webgpu/cpp/jsi/Promise.hpackages/webgpu/cpp/jsi/RNFPromise.h renamed to packages/webgpu/cpp/jsi/Promise.h

@@ -1,6 +1,3 @@
-//
-// Created by Marc Rousavy on 22.02.24.
-//
 #pragma once
 
 #include <jsi/jsi.h>
@@ -9,7 +6,7 @@
 #include <string>
 #include <memory>
 
-namespace margelo {
+namespace rnwgpu {
 
 namespace jsi = facebook::jsi;
 
@@ -35,4 +32,4 @@ class Promise {
   static jsi::Value createPromise(jsi::Runtime& runtime, RunPromise run);
 };
 
-} // namespace margelo
+} // namespace rnwgpu

packages/webgpu/cpp/jsi/RNFRuntimeState.cpp

@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "RNFJSIConverter.h"
+#include "JSIConverter.h"
 
 namespace rnwgpu {
 
@@ -24,21 +24,17 @@ struct ArrayBuffer : jsi::MutableBuffer {
   size_t _bytesPerElement;
 };
 
-} // namespace rnwgpu
-
-namespace margelo {
-
-static std::shared_ptr<rnwgpu::ArrayBuffer>
+static std::shared_ptr<ArrayBuffer>
 createArrayBufferFromJSI(jsi::Runtime &runtime,
                          const jsi::ArrayBuffer &arrayBuffer,
                          size_t bytesPerElement) {
   auto size = arrayBuffer.size(runtime);
-  return std::make_shared<rnwgpu::ArrayBuffer>(arrayBuffer.data(runtime), size,
-                                               bytesPerElement);
+  return std::make_shared<ArrayBuffer>(arrayBuffer.data(runtime), size,
+                                       bytesPerElement);
 }
 
-template <> struct JSIConverter<std::shared_ptr<rnwgpu::ArrayBuffer>> {
-  static std::shared_ptr<rnwgpu::ArrayBuffer>
+template <> struct JSIConverter<std::shared_ptr<ArrayBuffer>> {
+  static std::shared_ptr<ArrayBuffer>
   fromJSI(jsi::Runtime &runtime, const jsi::Value &arg, bool outOfBound) {
     if (arg.isObject()) {
       auto obj = arg.getObject(runtime);
@@ -64,9 +60,9 @@ template <> struct JSIConverter<std::shared_ptr<rnwgpu::ArrayBuffer>> {
   }
 
   static jsi::Value toJSI(jsi::Runtime &runtime,
-                          std::shared_ptr<rnwgpu::ArrayBuffer> arg) {
+                          std::shared_ptr<ArrayBuffer> arg) {
     return jsi::ArrayBuffer(runtime, arg);
   }
 };
 
-} // namespace margelo
+} // namespace rnwgpu