react-native-wgpu 0.2.7 → 0.2.9

package/cpp/dawn/native/MetalBackend.h

@@ -43,6 +43,7 @@ namespace dawn::native::metal {
 // does have a global queue of graphics operations, but the command buffers are inserted there
 // when they are "scheduled". Submitting other operations before the command buffer is
 // scheduled could lead to races in who gets scheduled first and incorrect rendering.
+// TODO(crbug.com/444702048): Remove after migrating Chromium to commands scheduled futures.
 DAWN_NATIVE_EXPORT void WaitForCommandsToBeScheduled(WGPUDevice device);
 
 #if defined(__OBJC__)

package/cpp/dawn/native/WebGPUBackend.h

@@ -28,8 +28,22 @@
 #ifndef INCLUDE_DAWN_NATIVE_WEBGPUBACKEND_H_
 #define INCLUDE_DAWN_NATIVE_WEBGPUBACKEND_H_
 
+#include <ostream>
+
 #include "dawn/native/DawnNative.h"
 
-namespace dawn::native::webgpu {}  // namespace dawn::native::webgpu
+namespace dawn::native::webgpu {
+
+using CaptureStream = std::ostream;
+
+// Starts a capture on the given device.
+DAWN_NATIVE_EXPORT void StartCapture(WGPUDevice device,
+                                     CaptureStream& commandStream,
+                                     CaptureStream& contentStream);
+
+// Ends a capture on the given device.
+DAWN_NATIVE_EXPORT void EndCapture(WGPUDevice device);
+
+}  // namespace dawn::native::webgpu
 
 #endif  // INCLUDE_DAWN_NATIVE_WEBGPUBACKEND_H_

package/cpp/dawn/webgpu_cpp_print.h

@@ -785,6 +785,9 @@ namespace wgpu {
         break;
       case FeatureName::ChromiumExperimentalBindless:
         o << "FeatureName::ChromiumExperimentalBindless";
+        break;
+      case FeatureName::AdapterPropertiesWGPU:
+        o << "FeatureName::AdapterPropertiesWGPU";
         break;
           default:
             o << "FeatureName::" << std::showbase << std::hex << std::setfill('0') << std::setw(4) << static_cast<typename std::underlying_type<FeatureName>::type>(value);
@@ -1514,6 +1517,12 @@ namespace wgpu {
         break;
       case SType::TexelBufferBindingLayout:
         o << "SType::TexelBufferBindingLayout";
+        break;
+      case SType::SharedTextureMemoryMetalEndAccessState:
+        o << "SType::SharedTextureMemoryMetalEndAccessState";
+        break;
+      case SType::AdapterPropertiesWGPU:
+        o << "SType::AdapterPropertiesWGPU";
         break;
           default:
             o << "SType::" << std::showbase << std::hex << std::setfill('0') << std::setw(4) << static_cast<typename std::underlying_type<SType>::type>(value);

package/cpp/rnwgpu/api/GPUAdapter.cpp

@@ -151,10 +151,4 @@ std::shared_ptr<GPUAdapterInfo> GPUAdapter::getInfo() {
   return std::make_shared<GPUAdapterInfo>(info);
 }
 
-bool GPUAdapter::getIsFallbackAdapter() {
-  wgpu::AdapterInfo adapterInfo = {};
-  _instance.GetInfo(&adapterInfo);
-  return adapterInfo.adapterType == wgpu::AdapterType::CPU;
-}
-
 } // namespace rnwgpu

package/cpp/rnwgpu/api/GPUAdapter.h

@@ -37,7 +37,6 @@ public:
   std::unordered_set<std::string> getFeatures();
   std::shared_ptr<GPUSupportedLimits> getLimits();
   std::shared_ptr<GPUAdapterInfo> getInfo();
-  bool getIsFallbackAdapter();
 
   void loadHybridMethods() override {
     registerHybridGetter("__brand", &GPUAdapter::getBrand, this);
@@ -45,8 +44,6 @@ public:
     registerHybridGetter("features", &GPUAdapter::getFeatures, this);
     registerHybridGetter("limits", &GPUAdapter::getLimits, this);
     registerHybridGetter("info", &GPUAdapter::getInfo, this);
-    registerHybridGetter("isFallbackAdapter", &GPUAdapter::getIsFallbackAdapter,
-                         this);
   }
 
   inline const wgpu::Adapter get() { return _instance; }

package/cpp/rnwgpu/api/GPUAdapterInfo.h

@@ -21,7 +21,8 @@ public:
   explicit GPUAdapterInfo(wgpu::AdapterInfo &info)
       : HybridObject("GPUAdapterInfo"), _vendor(info.vendor),
         _architecture(info.architecture), _device(info.device),
-        _description(info.description) {}
+        _description(info.description),
+        _isFallbackAdapter(info.adapterType == wgpu::AdapterType::CPU) {}
 
 public:
   std::string getBrand() { return _name; }
@@ -30,6 +31,7 @@ public:
   std::string getArchitecture() { return _architecture; }
   std::string getDevice() { return _device; }
   std::string getDescription() { return _description; }
+  bool getIsFallbackAdapter() { return _isFallbackAdapter; }
 
   void loadHybridMethods() override {
     registerHybridGetter("__brand", &GPUAdapterInfo::getBrand, this);
@@ -39,6 +41,8 @@ public:
                          this);
     registerHybridGetter("device", &GPUAdapterInfo::getDevice, this);
     registerHybridGetter("description", &GPUAdapterInfo::getDescription, this);
+    registerHybridGetter("isFallbackAdapter",
+                         &GPUAdapterInfo::getIsFallbackAdapter, this);
   }
 
 private:
@@ -46,6 +50,7 @@ private:
   std::string _architecture;
   std::string _device;
   std::string _description;
+  bool _isFallbackAdapter;
 };
 
 } // namespace rnwgpu

package/cpp/rnwgpu/api/GPUCommandEncoder.cpp

@@ -41,7 +41,7 @@ std::shared_ptr<GPURenderPassEncoder> GPUCommandEncoder::beginRenderPass(
     std::shared_ptr<GPURenderPassDescriptor> descriptor) {
 
   wgpu::RenderPassDescriptor desc{};
-  wgpu::RenderPassDescriptorMaxDrawCount maxDrawCountDesc{};
+  wgpu::RenderPassMaxDrawCount maxDrawCountDesc{};
   desc.nextInChain = &maxDrawCountDesc;
   Convertor conv;
 

package/cpp/rnwgpu/api/GPUDevice.cpp

@@ -70,7 +70,7 @@ GPUDevice::createTexture(std::shared_ptr<GPUTextureDescriptor> descriptor) {
 
 std::shared_ptr<GPUShaderModule> GPUDevice::createShaderModule(
     std::shared_ptr<GPUShaderModuleDescriptor> descriptor) {
-  wgpu::ShaderModuleWGSLDescriptor wgsl_desc{};
+  wgpu::ShaderSourceWGSL wgsl_desc{};
   wgpu::ShaderModuleDescriptor sm_desc{};
   Convertor conv;
   if (!conv(wgsl_desc.code, descriptor->code) ||

package/cpp/rnwgpu/api/descriptors/Unions.h

@@ -487,7 +487,7 @@ inline void convertJSUnionToEnum(const std::string &inUnion,
     *outEnum = wgpu::FeatureName::AdapterPropertiesVk;
   } else if (inUnion == "r8unorm-storage") {
     *outEnum = wgpu::FeatureName::R8UnormStorage;
-  } else if (inUnion == "dawn-format-capabilities") {
+  } else if (inUnion == "format-capabilities") {
     *outEnum = wgpu::FeatureName::DawnFormatCapabilities;
   } else if (inUnion == "norm16-texture-formats") {
     *outEnum = wgpu::FeatureName::Norm16TextureFormats;
@@ -590,6 +590,9 @@ inline void convertEnumToJSUnion(wgpu::FeatureName inEnum,
   case wgpu::FeatureName::DawnNative:
     *outUnion = "dawn-native";
     break;
+  case wgpu::FeatureName::DawnFormatCapabilities:
+    *outUnion = "format-capabilities";
+    break;
   case wgpu::FeatureName::ChromiumExperimentalTimestampQueryInsidePasses:
     *outUnion = "chromium-experimental-timestamp-query-inside-passes";
     break;
@@ -662,9 +665,6 @@ inline void convertEnumToJSUnion(wgpu::FeatureName inEnum,
   case wgpu::FeatureName::R8UnormStorage:
     *outUnion = "r8unorm-storage";
     break;
-  case wgpu::FeatureName::DawnFormatCapabilities:
-    *outUnion = "dawn-format-capabilities";
-    break;
   case wgpu::FeatureName::Norm16TextureFormats:
     *outUnion = "norm16-texture-formats";
     break;

package/cpp/webgpu/webgpu.h

@@ -149,6 +149,7 @@ typedef struct WGPUTextureViewImpl* WGPUTextureView WGPU_OBJECT_ATTRIBUTE;
 // Structure forward declarations
 struct WGPUAdapterPropertiesD3D;
 struct WGPUAdapterPropertiesVk;
+struct WGPUAdapterPropertiesWGPU;
 struct WGPUBindGroupDynamicBindingArray;
 struct WGPUBlendComponent;
 struct WGPUBufferBindingLayout;
@@ -296,7 +297,7 @@ struct WGPUSharedFenceExportInfo;
 struct WGPUSharedTextureMemoryAHardwareBufferProperties;
 struct WGPUSharedTextureMemoryBeginAccessDescriptor;
 struct WGPUSharedTextureMemoryDmaBufDescriptor;
-struct WGPUSharedTextureMemoryEndAccessState;
+struct WGPUSharedTextureMemoryMetalEndAccessState;
 struct WGPUSurfaceDescriptor;
 struct WGPUTexelCopyBufferInfo;
 struct WGPUTexelCopyTextureInfo;
@@ -314,6 +315,7 @@ struct WGPUDeviceDescriptor;
 struct WGPUPipelineLayoutDescriptor;
 struct WGPURenderPassPixelLocalStorage;
 struct WGPUSharedTextureMemoryDescriptor;
+struct WGPUSharedTextureMemoryEndAccessState;
 struct WGPUSharedTextureMemoryProperties;
 struct WGPUTextureViewDescriptor;
 struct WGPUVertexState;
@@ -613,6 +615,7 @@ typedef enum WGPUFeatureName {
     WGPUFeatureName_DawnDeviceAllocatorControl = 0x00050039,
     WGPUFeatureName_TextureComponentSwizzle = 0x0005003A,
     WGPUFeatureName_ChromiumExperimentalBindless = 0x0005003C,
+    WGPUFeatureName_AdapterPropertiesWGPU = 0x0005003D,
     WGPUFeatureName_Force32 = 0x7FFFFFFF
 } WGPUFeatureName WGPU_ENUM_ATTRIBUTE;
 
@@ -896,6 +899,8 @@ typedef enum WGPUSType {
     WGPUSType_BindGroupDynamicBindingArray = 0x0005004C,
     WGPUSType_TexelBufferBindingEntry = 0x0005004D,
     WGPUSType_TexelBufferBindingLayout = 0x0005004E,
+    WGPUSType_SharedTextureMemoryMetalEndAccessState = 0x0005004F,
+    WGPUSType_AdapterPropertiesWGPU = 0x00050050,
     WGPUSType_Force32 = 0x7FFFFFFF
 } WGPUSType WGPU_ENUM_ATTRIBUTE;
 
@@ -1446,6 +1451,20 @@ typedef struct WGPUAdapterPropertiesVk {
     /*.driverVersion=*/0 _wgpu_COMMA \
 })
 
+// Can be chained in WGPUAdapterInfo
+typedef struct WGPUAdapterPropertiesWGPU {
+    WGPUChainedStruct chain;
+    WGPUBackendType backendType;
+} WGPUAdapterPropertiesWGPU WGPU_STRUCTURE_ATTRIBUTE;
+
+#define WGPU_ADAPTER_PROPERTIES_WGPU_INIT _wgpu_MAKE_INIT_STRUCT(WGPUAdapterPropertiesWGPU, { \
+    /*.chain=*/_wgpu_MAKE_INIT_STRUCT(WGPUChainedStruct, { \
+        /*.next=*/NULL _wgpu_COMMA \
+        /*.sType=*/WGPUSType_AdapterPropertiesWGPU _wgpu_COMMA \
+    }) _wgpu_COMMA \
+    /*.backendType=*/WGPUBackendType_Undefined _wgpu_COMMA \
+})
+
 // Can be chained in WGPUBindGroupDescriptor
 typedef struct WGPUBindGroupDynamicBindingArray {
     WGPUChainedStruct chain;
@@ -3724,20 +3743,18 @@ typedef struct WGPUSharedTextureMemoryDmaBufDescriptor {
     /*.planes=*/NULL _wgpu_COMMA \
 })
 
-typedef struct WGPUSharedTextureMemoryEndAccessState {
-    WGPUChainedStruct * nextInChain;
-    WGPUBool initialized;
-    size_t fenceCount;
-    WGPUSharedFence const * fences;
-    uint64_t const * signaledValues;
-} WGPUSharedTextureMemoryEndAccessState WGPU_STRUCTURE_ATTRIBUTE;
+// Can be chained in WGPUSharedTextureMemoryEndAccessState
+typedef struct WGPUSharedTextureMemoryMetalEndAccessState {
+    WGPUChainedStruct chain;
+    WGPUFuture commandsScheduledFuture;
+} WGPUSharedTextureMemoryMetalEndAccessState WGPU_STRUCTURE_ATTRIBUTE;
 
-#define WGPU_SHARED_TEXTURE_MEMORY_END_ACCESS_STATE_INIT _wgpu_MAKE_INIT_STRUCT(WGPUSharedTextureMemoryEndAccessState, { \
-    /*.nextInChain=*/NULL _wgpu_COMMA \
-    /*.initialized=*/WGPU_FALSE _wgpu_COMMA \
-    /*.fenceCount=*/0 _wgpu_COMMA \
-    /*.fences=*/NULL _wgpu_COMMA \
-    /*.signaledValues=*/NULL _wgpu_COMMA \
+#define WGPU_SHARED_TEXTURE_MEMORY_METAL_END_ACCESS_STATE_INIT _wgpu_MAKE_INIT_STRUCT(WGPUSharedTextureMemoryMetalEndAccessState, { \
+    /*.chain=*/_wgpu_MAKE_INIT_STRUCT(WGPUChainedStruct, { \
+        /*.next=*/NULL _wgpu_COMMA \
+        /*.sType=*/WGPUSType_SharedTextureMemoryMetalEndAccessState _wgpu_COMMA \
+    }) _wgpu_COMMA \
+    /*.commandsScheduledFuture=*/WGPU_FUTURE_INIT _wgpu_COMMA \
 })
 
 typedef struct WGPUSurfaceDescriptor {
@@ -4002,6 +4019,22 @@ typedef struct WGPUSharedTextureMemoryDescriptor {
     /*.label=*/WGPU_STRING_VIEW_INIT _wgpu_COMMA \
 })
 
+typedef struct WGPUSharedTextureMemoryEndAccessState {
+    WGPUChainedStruct * nextInChain;
+    WGPUBool initialized;
+    size_t fenceCount;
+    WGPUSharedFence const * fences;
+    uint64_t const * signaledValues;
+} WGPUSharedTextureMemoryEndAccessState WGPU_STRUCTURE_ATTRIBUTE;
+
+#define WGPU_SHARED_TEXTURE_MEMORY_END_ACCESS_STATE_INIT _wgpu_MAKE_INIT_STRUCT(WGPUSharedTextureMemoryEndAccessState, { \
+    /*.nextInChain=*/NULL _wgpu_COMMA \
+    /*.initialized=*/WGPU_FALSE _wgpu_COMMA \
+    /*.fenceCount=*/0 _wgpu_COMMA \
+    /*.fences=*/NULL _wgpu_COMMA \
+    /*.signaledValues=*/NULL _wgpu_COMMA \
+})
+
 typedef struct WGPUSharedTextureMemoryProperties {
     WGPUChainedStruct * nextInChain;
     WGPUTextureUsage usage;
@@ -4124,42 +4157,6 @@ typedef struct WGPURenderPipelineDescriptor {
     /*.fragment=*/NULL _wgpu_COMMA \
 })
 
-// WGPURenderPassDescriptorMaxDrawCount is deprecated.
-// Use WGPURenderPassMaxDrawCount instead.
-typedef WGPURenderPassMaxDrawCount WGPURenderPassDescriptorMaxDrawCount;
-
-// WGPUShaderModuleSPIRVDescriptor is deprecated.
-// Use WGPUShaderSourceSPIRV instead.
-typedef WGPUShaderSourceSPIRV WGPUShaderModuleSPIRVDescriptor;
-
-// WGPUShaderModuleWGSLDescriptor is deprecated.
-// Use WGPUShaderSourceWGSL instead.
-typedef WGPUShaderSourceWGSL WGPUShaderModuleWGSLDescriptor;
-
-// WGPUSurfaceDescriptorFromAndroidNativeWindow is deprecated.
-// Use WGPUSurfaceSourceAndroidNativeWindow instead.
-typedef WGPUSurfaceSourceAndroidNativeWindow WGPUSurfaceDescriptorFromAndroidNativeWindow;
-
-// WGPUSurfaceDescriptorFromMetalLayer is deprecated.
-// Use WGPUSurfaceSourceMetalLayer instead.
-typedef WGPUSurfaceSourceMetalLayer WGPUSurfaceDescriptorFromMetalLayer;
-
-// WGPUSurfaceDescriptorFromWaylandSurface is deprecated.
-// Use WGPUSurfaceSourceWaylandSurface instead.
-typedef WGPUSurfaceSourceWaylandSurface WGPUSurfaceDescriptorFromWaylandSurface;
-
-// WGPUSurfaceDescriptorFromWindowsHWND is deprecated.
-// Use WGPUSurfaceSourceWindowsHWND instead.
-typedef WGPUSurfaceSourceWindowsHWND WGPUSurfaceDescriptorFromWindowsHWND;
-
-// WGPUSurfaceDescriptorFromXcbWindow is deprecated.
-// Use WGPUSurfaceSourceXCBWindow instead.
-typedef WGPUSurfaceSourceXCBWindow WGPUSurfaceDescriptorFromXcbWindow;
-
-// WGPUSurfaceDescriptorFromXlibWindow is deprecated.
-// Use WGPUSurfaceSourceXlibWindow instead.
-typedef WGPUSurfaceSourceXlibWindow WGPUSurfaceDescriptorFromXlibWindow;
-
 #ifdef __cplusplus
 extern "C" {
 #endif