dawn.patch

diff --git a/DEPS b/DEPS
index f16fbd1f..5ca2a73b 100644
--- a/DEPS
+++ b/DEPS
@@ -46,9 +46,9 @@ vars = {
   # different from the project used in 'rbe_instance'
   'rewrapper_cfg_project': '',
   # reclient CIPD package
-  'reclient_package': 'infra/rbe/client/',
+  # 'reclient_package': 'infra/rbe/client/',
   # reclient CIPD package version
-  'reclient_version': 're_client_version:0.176.0.8c46330a-gomaip',
+  # 'reclient_version': 're_client_version:0.176.0.8c46330a-gomaip',
   # siso CIPD package version.
   'siso_version': 'git_revision:15568691576f74b11a3c73c85a3c8dd5efb72f05',
 
@@ -429,17 +429,17 @@ deps = {
     'dep_type': 'cipd',
   },
 
-  # RBE dependencies
-  'buildtools/reclient': {
-    'packages': [
-      {
-        'package': Var('reclient_package') + '${{platform}}',
-        'version': Var('reclient_version'),
-      }
-    ],
-    'condition': 'dawn_standalone and (host_cpu != "arm64" or host_os == "mac") and non_git_source',
-    'dep_type': 'cipd',
-  },
+  # # RBE dependencies
+  # 'buildtools/reclient': {
+  #   'packages': [
+  #     {
+  #       'package': Var('reclient_package') + '${{platform}}',
+  #       'version': Var('reclient_version'),
+  #     }
+  #   ],
+  #   'condition': 'dawn_standalone and (host_cpu != "arm64" or host_os == "mac") and non_git_source',
+  #   'dep_type': 'cipd',
+  # },
 
   # Misc dependencies inherited from Tint
   'third_party/protobuf': {
@@ -687,53 +687,53 @@ hooks = [
   },
 
   # Configure remote exec cfg files
-  {
-    # Use luci_auth if on windows and using chrome-untrusted project
-    'name': 'download_and_configure_reclient_cfgs',
-    'pattern': '.',
-    'condition': 'dawn_standalone and download_remoteexec_cfg and host_os == "win"',
-    'action': ['python3',
-               'buildtools/reclient_cfgs/configure_reclient_cfgs.py',
-               '--rbe_instance',
-               Var('rbe_instance'),
-               '--reproxy_cfg_template',
-               'reproxy.cfg.template',
-               '--rewrapper_cfg_project',
-               Var('rewrapper_cfg_project'),
-               '--use_luci_auth_credshelper',
-               '--quiet',
-               ],
-  },  {
-    'name': 'download_and_configure_reclient_cfgs',
-    'pattern': '.',
-    'condition': 'dawn_standalone and download_remoteexec_cfg and not host_os == "win"',
-    'action': ['python3',
-               'buildtools/reclient_cfgs/configure_reclient_cfgs.py',
-               '--rbe_instance',
-               Var('rbe_instance'),
-               '--reproxy_cfg_template',
-               'reproxy.cfg.template',
-               '--rewrapper_cfg_project',
-               Var('rewrapper_cfg_project'),
-               '--quiet',
-               ],
-  },
-  {
-    'name': 'configure_reclient_cfgs',
-    'pattern': '.',
-    'condition': 'dawn_standalone and not download_remoteexec_cfg',
-    'action': ['python3',
-               'buildtools/reclient_cfgs/configure_reclient_cfgs.py',
-               '--rbe_instance',
-               Var('rbe_instance'),
-               '--reproxy_cfg_template',
-               'reproxy.cfg.template',
-               '--rewrapper_cfg_project',
-               Var('rewrapper_cfg_project'),
-               '--skip_remoteexec_cfg_fetch',
-               '--quiet',
-               ],
-  },
+  # {
+  #   # Use luci_auth if on windows and using chrome-untrusted project
+  #   'name': 'download_and_configure_reclient_cfgs',
+  #   'pattern': '.',
+  #   'condition': 'dawn_standalone and download_remoteexec_cfg and host_os == "win"',
+  #   'action': ['python3',
+  #              'buildtools/reclient_cfgs/configure_reclient_cfgs.py',
+  #              '--rbe_instance',
+  #              Var('rbe_instance'),
+  #              '--reproxy_cfg_template',
+  #              'reproxy.cfg.template',
+  #              '--rewrapper_cfg_project',
+  #              Var('rewrapper_cfg_project'),
+  #              '--use_luci_auth_credshelper',
+  #              '--quiet',
+  #              ],
+  # },  {
+  #   'name': 'download_and_configure_reclient_cfgs',
+  #   'pattern': '.',
+  #   'condition': 'dawn_standalone and download_remoteexec_cfg and not host_os == "win"',
+  #   'action': ['python3',
+  #              'buildtools/reclient_cfgs/configure_reclient_cfgs.py',
+  #              '--rbe_instance',
+  #              Var('rbe_instance'),
+  #              '--reproxy_cfg_template',
+  #              'reproxy.cfg.template',
+  #              '--rewrapper_cfg_project',
+  #              Var('rewrapper_cfg_project'),
+  #              '--quiet',
+  #              ],
+  # },
+  # {
+  #   'name': 'configure_reclient_cfgs',
+  #   'pattern': '.',
+  #   'condition': 'dawn_standalone and not download_remoteexec_cfg',
+  #   'action': ['python3',
+  #              'buildtools/reclient_cfgs/configure_reclient_cfgs.py',
+  #              '--rbe_instance',
+  #              Var('rbe_instance'),
+  #              '--reproxy_cfg_template',
+  #              'reproxy.cfg.template',
+  #              '--rewrapper_cfg_project',
+  #              Var('rewrapper_cfg_project'),
+  #              '--skip_remoteexec_cfg_fetch',
+  #              '--quiet',
+  #              ],
+  # },
   # Configure Siso for developer builds.
   {
     'name': 'configure_siso',
diff --git a/include/webgpu/webgpu_sdl.h b/include/webgpu/webgpu_sdl.h
new file mode 100644
index 00000000..98ae22ee
--- /dev/null
+++ b/include/webgpu/webgpu_sdl.h
@@ -0,0 +1,60 @@
+// Copyright 2022 The Dawn & Tint Authors
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this
+//    list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation
+//    and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its
+//    contributors may be used to endorse or promote products derived from
+//    this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef INCLUDE_WEBGPU_WEBGPU_SDL_H_
+#define INCLUDE_WEBGPU_WEBGPU_SDL_H_
+
+#include <memory>
+
+#include "dawn/dawn_proc.h"
+#include "webgpu/webgpu_cpp.h"
+
+#if defined(WGPU_SDL_SHARED_LIBRARY)
+#if defined(_WIN32)
+#if defined(WGPU_SDL_IMPLEMENTATION)
+#define WGPU_SDL_EXPORT __declspec(dllexport)
+#else
+#define WGPU_SDL_EXPORT __declspec(dllimport)
+#endif
+#else  // defined(_WIN32)
+#if defined(WGPU_SDL_IMPLEMENTATION)
+#define WGPU_SDL_EXPORT __attribute__((visibility("default")))
+#else
+#define WGPU_SDL_EXPORT
+#endif
+#endif  // defined(_WIN32)
+#else   // defined(WGPU_SDL_SHARED_LIBRARY)
+#define WGPU_SDL_EXPORT
+#endif  // defined(WGPU_SDL_SHARED_LIBRARY)
+
+namespace wgpu::sdl {
+
+WGPU_SDL_EXPORT WGPUSurface CreateSurfaceForWindow(const DawnProcTable *procs, const WGPUInstance& instance, void* nativeData);
+
+}  // namespace wgpu::sdl
+
+#endif  // INCLUDE_WEBGPU_WEBGPU_SDL_H_
diff --git a/src/dawn/CMakeLists.txt b/src/dawn/CMakeLists.txt
index fd2d98fe..5f0b0bad 100644
--- a/src/dawn/CMakeLists.txt
+++ b/src/dawn/CMakeLists.txt
@@ -112,6 +112,8 @@ if (DAWN_BUILD_NODE_BINDINGS)
   add_subdirectory(node)
 endif()
 
+add_subdirectory(sdl)
+
 ###############################################################################
 # libdawn_proc
 #   Only built when not building for Emscripten
diff --git a/src/dawn/node/CMakeLists.txt b/src/dawn/node/CMakeLists.txt
index 4ebff350..114937d1 100644
--- a/src/dawn/node/CMakeLists.txt
+++ b/src/dawn/node/CMakeLists.txt
@@ -113,6 +113,7 @@ target_link_libraries(dawn_node
         dawn_proc
         dawn_warnings_config
         libtint
+        dawn_sdl
 )
 target_include_directories(dawn_node
     PRIVATE
diff --git a/src/dawn/node/Module.cpp b/src/dawn/node/Module.cpp
index cb70833c..220e420e 100644
--- a/src/dawn/node/Module.cpp
+++ b/src/dawn/node/Module.cpp
@@ -30,10 +30,17 @@
 #include <tuple>
 #include <utility>
 #include <vector>
+#include <map>
 
 #include "dawn/dawn_proc.h"
 #include "src/dawn/node/binding/Flags.h"
 #include "src/dawn/node/binding/GPU.h"
+#include "src/dawn/node/binding/GPUDevice.h"
+#include "src/dawn/node/binding/GPUTexture.h"
+#include "src/dawn/node/binding/GPUTextureView.h"
+#include "src/dawn/node/binding/Converter.h"
+
+#include "webgpu/webgpu_sdl.h"
 
 #ifdef DAWN_EMIT_COVERAGE
 extern "C" {
@@ -43,10 +50,21 @@ int __llvm_profile_write_file(void);
 }
 #endif  // DAWN_EMIT_COVERAGE
 
+const DawnProcTable *procs;
+
+Napi::FunctionReference constructor;
+
+std::map<std::string, WGPUPresentMode> wgpuPresentModes = {
+    { "fifo", WGPUPresentMode_Fifo },
+    { "fifoRelaxed", WGPUPresentMode_FifoRelaxed },
+    { "immediate", WGPUPresentMode_Immediate },
+    { "mailbox", WGPUPresentMode_Mailbox }
+};
+
 namespace {
 
 Napi::Value CreateGPU(const Napi::CallbackInfo& info) {
-    const auto& env = info.Env();
+    const Napi::Env& env = info.Env();
 
     std::tuple<std::vector<std::string>> args;
     if (auto res = wgpu::interop::FromJS(info, args); !res) {
@@ -68,7 +86,174 @@ Napi::Value CreateGPU(const Napi::CallbackInfo& info) {
     }
 
     // Construct a wgpu::interop::GPU interface, implemented by wgpu::bindings::GPU.
-    return wgpu::interop::GPU::Create<wgpu::binding::GPU>(env, std::move(flags));
+    auto gpu = wgpu::interop::GPU::Create<wgpu::binding::GPU>(env, std::move(flags));
+    Napi::Object jsGpu = gpu;
+
+    return jsGpu;
+}
+
+class Renderer : public Napi::ObjectWrap<Renderer> {
+
+public:
+
+    static void Init(const Napi::Env &env) {
+        Napi::Function func = DefineClass(env, "Renderer", {
+            InstanceMethod("getPreferredFormat", &Renderer::getPreferredFormat),
+            InstanceMethod("getCurrentTexture", &Renderer::getCurrentTexture),
+            InstanceMethod("getCurrentTextureView", &Renderer::getCurrentTextureView),
+            InstanceMethod("swap", &Renderer::swap),
+            InstanceMethod("resize", &Renderer::resize),
+        });
+
+        constructor = Napi::Persistent(func);
+        constructor.SuppressDestruct();
+    }
+
+    Renderer(const Napi::CallbackInfo& info) : Napi::ObjectWrap<Renderer>(info) {
+        const Napi::Env& env = info.Env();
+
+        Napi::Object jsDevice = info[0].As<Napi::Object>();
+        _device = Napi::Persistent(jsDevice);
+
+        Napi::Object jsWindow = info[1].As<Napi::Object>();
+        _window = Napi::Persistent(jsWindow);
+
+        Napi::String jsPresentMode = info[2].As<Napi::String>();
+        _wgpuPresentMode = wgpuPresentModes[jsPresentMode.Utf8Value()];
+
+        _wgpuDevice = reinterpret_cast<wgpu::binding::GPUDevice*>(wgpu::interop::GPUDevice::Unwrap(_device.Value()))->device_.Get();
+        _wgpuAdapter = procs->deviceGetAdapter(_wgpuDevice);
+        _wgpuInstance = procs->adapterGetInstance(_wgpuAdapter);
+
+        _createSurface(env);
+    };
+
+    static Napi::Object NewInstance(Napi::Env env, Napi::Value device, Napi::Value window, Napi::Value presentMode) {
+        return constructor.New({ device, window, presentMode });
+    }
+
+    Napi::Value getPreferredFormat(const Napi::CallbackInfo& info) {
+        const Napi::Env& env = info.Env();
+
+        wgpu::interop::GPUTextureFormat format;
+        wgpu::binding::Converter convert(env);
+        bool success = convert(format, static_cast<wgpu::TextureFormat>(_wgpuPreferredFormat));
+        return success ? wgpu::interop::ToJS(env, format) : env.Null();
+    }
+
+    Napi::Value getCurrentTexture(const Napi::CallbackInfo& info) {
+        const Napi::Env& env = info.Env();
+
+        WGPUSurfaceTexture wgpuSurfaceTexture = {};
+        procs->surfaceGetCurrentTexture(_wgpuSurface, &wgpuSurfaceTexture);
+
+        return wgpu::interop::GPUTexture::Create<wgpu::binding::GPUTexture>(env,
+            wgpu::Device::Acquire(_wgpuDevice),
+            wgpu::TextureDescriptor(),
+            wgpu::Texture::Acquire(wgpuSurfaceTexture.texture)
+        );
+    }
+
+    Napi::Value getCurrentTextureView(const Napi::CallbackInfo& info) {
+        const Napi::Env& env = info.Env();
+
+        WGPUSurfaceTexture wgpuSurfaceTexture = {};
+        procs->surfaceGetCurrentTexture(_wgpuSurface, &wgpuSurfaceTexture);
+
+        WGPUTextureView wgpuTextureView = procs->textureCreateView(wgpuSurfaceTexture.texture, nullptr);
+
+        return wgpu::interop::GPUTextureView::Create<wgpu::binding::GPUTextureView>(env,
+            wgpu::TextureViewDescriptor(),
+            wgpu::TextureView::Acquire(wgpuTextureView)
+        );
+    }
+
+    Napi::Value swap(const Napi::CallbackInfo& info) {
+        const Napi::Env& env = info.Env();
+        procs->surfacePresent(_wgpuSurface);
+        return env.Undefined();
+    }
+
+    Napi::Value resize(const Napi::CallbackInfo& info) {
+        const Napi::Env& env = info.Env();
+        _createSurface(env);
+        return env.Undefined();
+    }
+
+private:
+
+    Napi::ObjectReference _device;
+    Napi::ObjectReference _window;
+    WGPUPresentMode _wgpuPresentMode;
+    WGPUDevice _wgpuDevice;
+    WGPUAdapter _wgpuAdapter;
+    WGPUInstance _wgpuInstance;
+    WGPUSurface _wgpuSurface;
+    WGPUTextureFormat _wgpuPreferredFormat;
+
+    void _createSurface(const Napi::Env &env) {
+        Napi::Buffer<char> buffer = { env, _window.Get("_native").As<Napi::Object>().Get("gpu") };
+        _wgpuSurface = wgpu::sdl::CreateSurfaceForWindow(procs, _wgpuInstance, buffer.Data());
+
+        WGPUSurfaceCapabilities wgpuCapabilities = {};
+        procs->surfaceGetCapabilities(_wgpuSurface, _wgpuAdapter, &wgpuCapabilities);
+
+        _wgpuPreferredFormat = wgpuCapabilities.formats[0];
+
+        WGPUSurfaceConfiguration wgpuConfig = {};
+        wgpuConfig.device = _wgpuDevice;
+        wgpuConfig.format = _wgpuPreferredFormat;
+        wgpuConfig.usage = WGPUTextureUsage_RenderAttachment;
+        wgpuConfig.alphaMode = WGPUCompositeAlphaMode_Opaque;
+        wgpuConfig.width = _window.Get("_pixelWidth").ToNumber().Uint32Value();
+        wgpuConfig.height = _window.Get("_pixelHeight").ToNumber().Uint32Value();
+        wgpuConfig.presentMode = _wgpuPresentMode;
+        procs->surfaceConfigure(_wgpuSurface, &wgpuConfig);
+    }
+};
+
+Napi::Value RenderGPUDeviceToWindow(const Napi::CallbackInfo& info) {
+    const Napi::Env& env = info.Env();
+
+    if (info.Length() != 1) {
+        Napi::Error::New(env, "renderGPUDeviceToWindow expects exactly 1 argument").ThrowAsJavaScriptException();
+        return env.Undefined();
+    }
+    Napi::Value jsArg = info[0];
+
+    if (!jsArg.IsObject()) {
+        Napi::Error::New(env, "argument to renderGPUDeviceToWindow must be an object").ThrowAsJavaScriptException();
+        return env.Undefined();
+    }
+    Napi::Object jsObj = jsArg.ToObject();
+
+    Napi::Value jsDevice = jsObj.Get("device");
+    if (!jsDevice.IsObject()) {
+        Napi::Error::New(env, "device argument to renderGPUDeviceToWindow must be an object").ThrowAsJavaScriptException();
+        return env.Undefined();
+    }
+
+    Napi::Value jsWindow = jsObj.Get("window");
+    if (!jsWindow.IsObject()) {
+        Napi::Error::New(env, "window argument to renderGPUDeviceToWindow must be an object").ThrowAsJavaScriptException();
+        return env.Undefined();
+    }
+
+    Napi::Value jsPresentMode = jsObj.Get("presentMode");
+    if (jsPresentMode.IsUndefined()) {
+        jsPresentMode = Napi::String::New(env, "fifo");
+    } else if (!jsPresentMode.IsString()) {
+        Napi::Error::New(env, "presentMode argument to renderGPUDeviceToWindow must be a string").ThrowAsJavaScriptException();
+        return env.Undefined();
+    } else {
+        std::string presentModeStr = jsPresentMode.As<Napi::String>().Utf8Value();
+        if (wgpuPresentModes.find(presentModeStr) == wgpuPresentModes.end()) {
+            Napi::Error::New(env, "presentMode argument to renderGPUDeviceToWindow has invalid value").ThrowAsJavaScriptException();
+            return env.Undefined();
+        }
+    }
+
+    return Renderer::NewInstance(env, jsDevice, jsWindow, jsPresentMode);
 }
 
 #ifdef DAWN_EMIT_COVERAGE
@@ -104,13 +289,18 @@ struct Coverage {
 // object.
 NAPI_MODULE_EXPORT Napi::Object Initialize(Napi::Env env, Napi::Object exports) {
     // Set all the Dawn procedure function pointers.
-    dawnProcSetProcs(&dawn::native::GetProcs());
+    procs = &dawn::native::GetProcs();
+    dawnProcSetProcs(procs);
 
     // Register all the interop types
     exports.Set(Napi::String::New(env, "globals"), wgpu::interop::Initialize(env));
 
     // Export function that creates and returns the wgpu::interop::GPU interface
-    exports.Set(Napi::String::New(env, "create"), Napi::Function::New<CreateGPU>(env));
+    exports.Set(Napi::String::New(env, "_create"), Napi::Function::New<CreateGPU>(env));
+
+    Renderer::Init(env);
+
+    exports.Set(Napi::String::New(env, "renderGPUDeviceToWindow"), Napi::Function::New<RenderGPUDeviceToWindow>(env));
 
 #ifdef DAWN_EMIT_COVERAGE
     Coverage* coverage = new Coverage();
diff --git a/src/dawn/node/binding/AsyncRunner.cpp b/src/dawn/node/binding/AsyncRunner.cpp
index 9c16028b..8bd3575f 100644
--- a/src/dawn/node/binding/AsyncRunner.cpp
+++ b/src/dawn/node/binding/AsyncRunner.cpp
@@ -66,7 +66,7 @@ void AsyncRunner::ScheduleProcessEvents(Napi::Env env) {
 
     auto weak_self = weak_this_;
     env.Global()
-        .Get("setImmediate")
+        .Get("setTimeout")
         .As<Napi::Function>()
         .Call({
             // TODO(crbug.com/dawn/1127): Create once, reuse.
@@ -78,9 +78,15 @@ void AsyncRunner::ScheduleProcessEvents(Napi::Env env) {
                                     }
 
                                     self->process_events_queued_ = false;
+
+                                    if (self->tasks_waiting_ == 0) {
+                                        return ;
+                                    }
+
                                     wgpuInstanceProcessEvents(self->instance_->Get());
                                     self->ScheduleProcessEvents(env);
                                 }),
+            Napi::Number::New(env, 100)
         });
 }
 
diff --git a/src/dawn/node/binding/GPU.h b/src/dawn/node/binding/GPU.h
index 64c2a35f..2631e749 100644
--- a/src/dawn/node/binding/GPU.h
+++ b/src/dawn/node/binding/GPU.h
@@ -51,9 +51,10 @@ class GPU final : public interop::GPU {
     interop::GPUTextureFormat getPreferredCanvasFormat(Napi::Env) override;
     interop::Interface<interop::WGSLLanguageFeatures> getWgslLanguageFeatures(Napi::Env) override;
 
+    std::unique_ptr<dawn::native::Instance> instance_;
+
   private:
     const Flags flags_;
-    std::unique_ptr<dawn::native::Instance> instance_;
     std::shared_ptr<AsyncRunner> async_;
 };
 
diff --git a/src/dawn/node/binding/GPUDevice.h b/src/dawn/node/binding/GPUDevice.h
index 33a0bb55..32eb4994 100644
--- a/src/dawn/node/binding/GPUDevice.h
+++ b/src/dawn/node/binding/GPUDevice.h
@@ -130,9 +130,10 @@ class GPUDevice final : public interop::GPUDevice, EventTarget {
                                               ErrorType type,
                                               wgpu::StringView message);
 
+    wgpu::Device device_;
+
   private:
     Napi::Env env_;
-    wgpu::Device device_;
     std::shared_ptr<AsyncRunner> async_;
 
     // This promise's JS object lives as long as the device because it is stored in .lost
diff --git a/src/dawn/sdl/BUILD.gn b/src/dawn/sdl/BUILD.gn
new file mode 100644
index 00000000..e21b8881
--- /dev/null
+++ b/src/dawn/sdl/BUILD.gn
@@ -0,0 +1,50 @@
+# Copyright 2022 The Dawn & Tint Authors
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+#    contributors may be used to endorse or promote products derived from
+#    this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import("../../../scripts/dawn_overrides_with_defaults.gni")
+
+import("${dawn_root}/scripts/dawn_component.gni")
+import("${dawn_root}/scripts/dawn_features.gni")
+
+###############################################################################
+# SDL utils
+###############################################################################
+
+static_library("sdl") {
+  defines = [ "WGPU_SDL_IMPLEMENTATION" ]
+
+  sources = [ "utils.cpp" ]
+  deps = [
+    "${dawn_root}/src/dawn:cpp",
+    "${dawn_root}/src/dawn:proc",
+    "${dawn_root}/src/dawn/common",
+  ]
+
+  public_deps = [
+    "${dawn_root}/include/dawn:cpp_headers",
+  ]
+}
diff --git a/src/dawn/sdl/CMakeLists.txt b/src/dawn/sdl/CMakeLists.txt
new file mode 100644
index 00000000..f8f8a79c
--- /dev/null
+++ b/src/dawn/sdl/CMakeLists.txt
@@ -0,0 +1,49 @@
+# Copyright 2022 The Dawn & Tint Authors
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+#    contributors may be used to endorse or promote products derived from
+#    this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+add_library(dawn_sdl STATIC ${DAWN_PLACEHOLDER_FILE})
+common_compile_options(dawn_sdl)
+target_sources(dawn_sdl
+  INTERFACE
+    "${DAWN_INCLUDE_DIR}/webgpu/webgpu_sdl.h"
+  PRIVATE
+    "utils.cpp"
+)
+target_link_libraries(dawn_sdl
+  PUBLIC
+    dawncpp_headers
+    dawn_common
+  PRIVATE
+    dawn_internal_config
+)
+
+target_compile_definitions(dawn_sdl PRIVATE "WGPU_IMPLEMENTATION")
+if(BUILD_SHARED_LIBS)
+    target_compile_definitions(dawn_sdl PRIVATE "WGPU_SHARED_LIBRARY")
+endif()
+
+add_library(webgpu_sdl ALIAS dawn_sdl)
diff --git a/src/dawn/sdl/utils.cpp b/src/dawn/sdl/utils.cpp
new file mode 100644
index 00000000..a774d8ca
--- /dev/null
+++ b/src/dawn/sdl/utils.cpp
@@ -0,0 +1,107 @@
+// Copyright 2020 The Dawn & Tint Authors
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this
+//    list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation
+//    and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its
+//    contributors may be used to endorse or promote products derived from
+//    this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <cstdlib>
+#include <memory>
+#include <utility>
+
+#include "dawn/common/Platform.h"
+#include "webgpu/webgpu_sdl.h"
+
+namespace wgpu::sdl {
+
+#if DAWN_PLATFORM_IS(WINDOWS)
+    #include <windows.h>
+    struct NativeData {
+        HWND hwnd;
+        HINSTANCE hinstance;
+    };
+#elif defined(DAWN_ENABLE_BACKEND_METAL)
+    class CALayer;
+    struct NativeData {
+        CALayer *layer;
+    };
+#elif defined(DAWN_USE_X11)
+    #include <X11/Xlib.h>
+    struct NativeData {
+        Display* display;
+        Window window;
+    };
+#endif
+
+std::unique_ptr<WGPUChainedStruct, void (*)(WGPUChainedStruct*)> GetSurfaceDescriptor(NativeData* native) {
+#if DAWN_PLATFORM_IS(WINDOWS)
+    WGPUSurfaceSourceWindowsHWND* desc = new WGPUSurfaceSourceWindowsHWND();
+    desc->chain.next = nullptr;
+    desc->chain.sType = WGPUSType_SurfaceSourceWindowsHWND;
+    desc->hwnd = native->hwnd;
+    desc->hinstance = native->hinstance;
+    return {
+        reinterpret_cast<WGPUChainedStruct*>(desc),
+        [](WGPUChainedStruct* desc) {
+            delete reinterpret_cast<WGPUSurfaceSourceWindowsHWND*>(desc);
+        }
+    };
+#elif defined(DAWN_ENABLE_BACKEND_METAL)
+    WGPUSurfaceSourceMetalLayer* desc = new WGPUSurfaceSourceMetalLayer();
+    desc->chain.next = nullptr;
+    desc->chain.sType = WGPUSType_SurfaceSourceMetalLayer;
+    desc->layer = native->layer;
+    return {
+        reinterpret_cast<WGPUChainedStruct*>(desc),
+        [](WGPUChainedStruct* desc) {
+            delete reinterpret_cast<WGPUSurfaceSourceMetalLayer*>(desc);
+        }
+    };
+#elif defined(DAWN_USE_X11)
+    WGPUSurfaceSourceXlibWindow* desc = new WGPUSurfaceSourceXlibWindow();
+    desc->chain.next = nullptr;
+    desc->chain.sType = WGPUSType_SurfaceSourceXlibWindow;
+    desc->display = native->display;
+    desc->window = native->window;
+    return {
+        reinterpret_cast<WGPUChainedStruct*>(desc),
+        [](WGPUChainedStruct* desc) {
+            delete reinterpret_cast<WGPUSurfaceSourceXlibWindow*>(desc);
+        }
+    };
+#else
+    return { nullptr, [](WGPUChainedStruct*) {} };
+#endif
+}
+
+WGPUSurface CreateSurfaceForWindow(const DawnProcTable *procs, const WGPUInstance& instance, void* window) {
+    std::unique_ptr<WGPUChainedStruct, void (*)(WGPUChainedStruct*)> chainedDescriptor = GetSurfaceDescriptor((NativeData*) window);
+
+    WGPUSurfaceDescriptor surfaceDesc = {};
+    surfaceDesc.nextInChain = chainedDescriptor.get();
+    WGPUSurface surface = procs->instanceCreateSurface(instance, &surfaceDesc);
+
+    return surface;
+}
+
+}  // namespace wgpu::sdl