Update Dawn to 6723

Author: Chainsawkitten

code_generation/commands.py

@@ -331,8 +331,8 @@ def add_set_bind_group_command(classType, methodName):
 DebugOutput(code);
 DebugOutput("\\n");
 
-WGPUShaderModuleWGSLDescriptor wgsl = {};
-wgsl.chain.sType = WGPUSType_ShaderModuleWGSLDescriptor;
+WGPUShaderSourceWGSL wgsl = {};
+wgsl.chain.sType = WGPUSType_ShaderSourceWGSL;
 wgsl.code = code;
 
 WGPUShaderModuleDescriptor descriptor = {};

code_generation/custom_types.py

@@ -189,4 +189,16 @@ def cleanup(self, name):
     + Uint32DefaultMax.load("$name.layout.bytesPerRow") + "\n"
     + Uint32DefaultMax.load("$name.layout.rowsPerImage"),
     "WGPUImageCopyBuffer $name;",
-    "&$name")
+    "&$name")
+
+# TODO Remove and use GPUOptionalBool instead once wgpu-native updates to latest headers.
+DepthWriteEnabled = CustomType("""
+__WebGPUReconstruct_file.writeUint8($name);
+""",
+"""
+#if WEBGPU_BACKEND_DAWN
+$name = reader.ReadUint8() ? WGPUOptionalBool_True : WGPUOptionalBool_False;
+#else
+$name = reader.ReadUint8();
+#endif
+""")

code_generation/struct_types.py

@@ -286,7 +286,7 @@ def cleanup(self, name):
 
 GPUDepthStencilState = StructType("GPUDepthStencilState", [
     [GPUTextureFormat, "format"],
-    [Bool, "depthWriteEnabled"],
+    [DepthWriteEnabled, "depthWriteEnabled"],
     [GPUCompareFunction, "depthCompare"],
     [GPUStencilFaceState, "stencilFront", '{}'],
     [GPUStencilFaceState, "stencilBack", '{}'],

replay/Adapter.cpp

@@ -66,32 +66,32 @@ void Adapter::CreateInstance() {
 
 void Adapter::CreateSurface(const Window& window) {
 #if __ANDROID__
-    WGPUSurfaceDescriptorFromAndroidNativeWindow platformSurfaceDescriptor = {};
-    platformSurfaceDescriptor.chain.next = nullptr;
-    platformSurfaceDescriptor.chain.sType = WGPUSType_SurfaceDescriptorFromAndroidNativeWindow;
-    platformSurfaceDescriptor.window = window.window;
+    WGPUSurfaceSourceAndroidNativeWindow platformSurfaceSource = {};
+    platformSurfaceSource.chain.next = nullptr;
+    platformSurfaceSource.chain.sType = WGPUSType_SurfaceSourceAndroidNativeWindow;
+    platformSurfaceSource.window = window.window;
 #elif defined(_WIN32) || defined(WIN32)
-    WGPUSurfaceDescriptorFromWindowsHWND platformSurfaceDescriptor = {};
-    platformSurfaceDescriptor.chain.next = nullptr;
-    platformSurfaceDescriptor.chain.sType = WGPUSType_SurfaceDescriptorFromWindowsHWND;
-    platformSurfaceDescriptor.hinstance = GetModuleHandle(NULL);
-    platformSurfaceDescriptor.hwnd = glfwGetWin32Window(window.window);
+    WGPUSurfaceDescriptorFromWindowsHWND platformSurfaceSource = {};
+    platformSurfaceSource.chain.next = nullptr;
+    platformSurfaceSource.chain.sType = WGPUSType_SurfaceSourceWindowsHWND;
+    platformSurfaceSource.hinstance = GetModuleHandle(NULL);
+    platformSurfaceSource.hwnd = glfwGetWin32Window(window.window);
 #elif __APPLE__
 #error "WebGPU surface support has not been implemented on Mac."
-    /// @todo Implement WGPUSurfaceDescriptorFromMetalLayer
+    /// @todo Implement WGPUSurfaceSourceMetalLayer
 #elif __linux__
-    WGPUSurfaceDescriptorFromXlibWindow platformSurfaceDescriptor = {};
-    platformSurfaceDescriptor.chain.next = nullptr;
-    platformSurfaceDescriptor.chain.sType = WGPUSType_SurfaceDescriptorFromXlibWindow;
-    platformSurfaceDescriptor.display = glfwGetX11Display();
-    platformSurfaceDescriptor.window = glfwGetX11Window(window.window);
+    WGPUSurfaceDescriptorFromXlibWindow platformSurfaceSource = {};
+    platformSurfaceSource.chain.next = nullptr;
+    platformSurfaceSource.chain.sType = WGPUSType_SurfaceSourceXlibWindow;
+    platformSurfaceSource.display = glfwGetX11Display();
+    platformSurfaceSource.window = glfwGetX11Window(window.window);
 #else
 #error "Unsupported platform"
 #endif
 
     WGPUSurfaceDescriptor surfaceDescriptor = {};
     surfaceDescriptor.label = nullptr;
-    surfaceDescriptor.nextInChain = reinterpret_cast<const WGPUChainedStruct*>(&platformSurfaceDescriptor);
+    surfaceDescriptor.nextInChain = reinterpret_cast<const WGPUChainedStruct*>(&platformSurfaceSource);
 
     surface = wgpuInstanceCreateSurface(instance, &surfaceDescriptor);
 }

replay/Capture.cpp

@@ -37,9 +37,9 @@ Capture::Capture(string_view filename, Adapter& adapter, Device& device, SwapCha
     }
 
     // Create render pipeline to copy "swapchain" texture to actual swapchain texture.
-    WGPUShaderModuleWGSLDescriptor wgslDescriptor = {};
-    wgslDescriptor.chain.sType = WGPUSType_ShaderModuleWGSLDescriptor;
-    wgslDescriptor.code = R"(
+    WGPUShaderSourceWGSL wgslSource = {};
+    wgslSource.chain.sType = WGPUSType_ShaderSourceWGSL;
+    wgslSource.code = R"(
 struct VertexOutput {
   @builtin(position) Position : vec4f,
   @location(0) fragUV : vec2f,
@@ -69,10 +69,10 @@ fn main(
 )";
 
     WGPUShaderModuleDescriptor moduleDescriptor = {};
-    moduleDescriptor.nextInChain = reinterpret_cast<const WGPUChainedStruct*>(&wgslDescriptor);
+    moduleDescriptor.nextInChain = reinterpret_cast<const WGPUChainedStruct*>(&wgslSource);
     copyVertexShader = wgpuDeviceCreateShaderModule(device.GetDevice(), &moduleDescriptor);
 
-    wgslDescriptor.code = R"(
+    wgslSource.code = R"(
 @group(0) @binding(0) var mySampler: sampler;
 @group(0) @binding(1) var myTexture: texture_2d<f32>;
 

replay/WebGPU.hpp

@@ -2,6 +2,10 @@
 
 #if WEBGPU_BACKEND_DAWN
 #include <dawn/webgpu.h>
+
+// TODO Remove once wgpu-native has updated to latest headers.
+typedef WGPUBufferUsage WGPUBufferUsageFlags;
+typedef WGPUTextureUsage WGPUTextureUsageFlags;
 #endif
 
 #if WEBGPU_BACKEND_WGPU
@@ -10,4 +14,17 @@
 inline void wgpuDeviceTick(WGPUDevice device) {
     wgpuDevicePoll(device, false, nullptr);
 }
+
+// TODO Remove once wgpu-native has update to latest headers.
+typedef WGPUSurfaceDescriptorFromAndroidNativeWindow WGPUSurfaceSourceAndroidNativeWindow;
+typedef WGPUSurfaceDescriptorFromWindowsHWND WGPUSurfaceSourceWindowsHWND;
+typedef WGPUSurfaceDescriptorFromXlibWindow WGPUSurfaceSourceXlibWindow;
+
+const WGPUSType WGPUSType_SurfaceSourceAndroidNativeWindow = WGPUSType_SurfaceDescriptorFromAndroidNativeWindow;
+const WGPUSType WGPUSType_SurfaceSourceWindowsHWND = WGPUSType_SurfaceDescriptorFromWindowsHWND;
+const WGPUSType WGPUSType_SurfaceSourceXlibWindow = WGPUSType_SurfaceDescriptorFromXlibWindow;
+
+typedef WGPUShaderModuleWGSLDescriptor WGPUShaderSourceWGSL;
+
+const WGPUSType WGPUSType_ShaderSourceWGSL = WGPUSType_ShaderModuleWGSLDescriptor;
 #endif