PR Feedback (temporary commit)

Author: AndyHovingh

filament/backend/CMakeLists.txt

@@ -255,6 +255,16 @@ if (FILAMENT_SUPPORTS_WEBGPU)
     elseif (ANDROID)
         list(APPEND SRCS src/webgpu/platform/WebGPUPlatformAndroid.cpp)
     endif()
+
+    if (TNT_DEV)
+        set(FILAMENT_WEBGPU_IMMEDIATE_ERROR_HANDLING_DEFAULT ON)
+    else()
+        set(FILAMENT_WEBGPU_IMMEDIATE_ERROR_HANDLING_DEFAULT OFF)
+    endif()
+
+    option(FILAMENT_WEBGPU_IMMEDIATE_ERROR_HANDLING
+            "Enable immediate_error_handling for the WebGPU backend Dawn implementation"
+            ${FILAMENT_WEBGPU_IMMEDIATE_ERROR_HANDLING_DEFAULT})
 endif()
 
 if (ANDROID)
@@ -441,6 +451,10 @@ if (FILAMENT_SUPPORTS_METAL)
     target_compile_definitions(${TARGET} PRIVATE $<$<BOOL:${FILAMENT_METAL_PROFILING}>:FILAMENT_METAL_PROFILING>)
 endif()
 
+if (FILAMENT_SUPPORTS_WEBGPU)
+    target_compile_definitions(${TARGET} PRIVATE $<$<BOOL:${FILAMENT_WEBGPU_IMMEDIATE_ERROR_HANDLING}>:FILAMENT_WEBGPU_IMMEDIATE_ERROR_HANDLING>)
+endif()
+
 target_link_libraries(${TARGET} PRIVATE
         ${OSMESA_LINKER_FLAGS}
         $<$<AND:$<PLATFORM_ID:Linux>,$<CONFIG:Release>>:${LINUX_LINKER_OPTIMIZATION_FLAGS}>

filament/backend/include/backend/platforms/WebGPUPlatform.h

@@ -57,7 +57,7 @@ class WebGPUPlatform final : public Platform {
             const Platform::DriverConfig& driverConfig) noexcept override;
 
 private:
-    wgpu::Instance mInstance;
+    wgpu::Instance mInstance;  // we may consider having the driver own this in the future
 };
 
 }// namespace filament::backend

filament/backend/src/webgpu/WebGPUDriver.cpp

@@ -461,8 +461,7 @@ void WebGPUDriver::createSwapChainR(Handle<HwSwapChain> sch, void* nativeWindow,
 #endif
     mQueue = mDevice.GetQueue();
     // TODO configure the surface (maybe before or after creating the swapchain?
-    // how do we get the
-    //                             surface extent?)
+    //                             how do we get the surface extent?)
     // TODO actually create the swapchain
     FWGPU_LOGW << "WebGPU support is still essentially a no-op at this point in development (only "
                   "background components have been instantiated/selected, such as surface/screen, "

filament/backend/src/webgpu/platform/WebGPUPlatform.cpp

@@ -33,17 +33,24 @@ namespace {
 
 //either returns a valid instance or panics
 [[nodiscard]] wgpu::Instance createInstance() {
+  wgpu::DawnTogglesDescriptor dawnTogglesDescriptor{};
+#if defined(FILAMENT_WEBGPU_IMMEDIATE_ERROR_HANDLING)
+#if FWGPU_ENABLED(FWGPU_PRINT_SYSTEM)
+    FWGPU_LOGI << "setting on toggle enable_immediate_error_handling"
+               << utils::io::endl;
+#endif
     /**
      * Have the un-captured error callback invoked immediately when an error occurs, rather than
      * waiting for the next Tick. This enables using the stack trace in which the un-captured error
      * occurred when breaking into the un-captured error callback.
      * https://crbug.com/dawn/1789
      */
     static const char* toggleName = "enable_immediate_error_handling";
-    wgpu::DawnTogglesDescriptor dawnTogglesDescriptor{};
     dawnTogglesDescriptor.enabledToggleCount = 1;
     dawnTogglesDescriptor.enabledToggles = &toggleName;
-    wgpu::InstanceDescriptor instanceDescriptor{ .nextInChain = &dawnTogglesDescriptor,
+#endif
+    wgpu::InstanceDescriptor instanceDescriptor{
+        .nextInChain = &dawnTogglesDescriptor,
         .capabilities = {
             .timedWaitAnyEnable = true// TODO consider using pure async instead
         } };
@@ -65,6 +72,7 @@ wgpu::Adapter WebGPUPlatform::requestAdapter(wgpu::Surface const& surface) {
             mInstance.RequestAdapter(&adaptorOptions, wgpu::CallbackMode::WaitAnyOnly,
                     [&adapter](wgpu::RequestAdapterStatus const status,
                             wgpu::Adapter const& readyAdapter, wgpu::StringView const message) {
+                        // TODO consider more robust error handling
                         FILAMENT_CHECK_POSTCONDITION(status == wgpu::RequestAdapterStatus::Success)
                                 << "Unable to request a WebGPU adapter. Status "
                                 << static_cast<uint32_t>(status)