Port the Web backend to the Context trait

Author: kvark

examples/capture/main.rs

@@ -23,7 +23,8 @@ async fn run() {
             },
             limits: wgpu::Limits::default(),
         })
-        .await;
+        .await
+        .unwrap();
 
     // Rendered image is 256×256 with 32-bit RGBA color
     let size = 256u32;

examples/framework.rs

@@ -50,7 +50,7 @@ async fn run_async<E: Example>(event_loop: EventLoop<()>, window: Window) {
     log::info!("Initializing the surface...");
 
     let instance = wgpu::Instance::new();
-    let (size, surface) = {
+    let (size, surface) = unsafe {
         let size = window.inner_size();
         let surface = instance.create_surface(&window);
         (size, surface)
@@ -74,7 +74,8 @@ async fn run_async<E: Example>(event_loop: EventLoop<()>, window: Window) {
             },
             limits: wgpu::Limits::default(),
         })
-        .await;
+        .await
+        .unwrap();
 
     let mut sc_desc = wgpu::SwapChainDescriptor {
         usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,

examples/hello-compute/main.rs

@@ -39,7 +39,8 @@ async fn execute_gpu(numbers: Vec<u32>) -> Vec<u32> {
             },
             limits: wgpu::Limits::default(),
         })
-        .await;
+        .await
+        .unwrap();
 
     let cs = include_bytes!("shader.comp.spv");
     let cs_module =

examples/hello-triangle/main.rs

@@ -7,7 +7,7 @@ use winit::{
 async fn run(event_loop: EventLoop<()>, window: Window, swapchain_format: wgpu::TextureFormat) {
     let size = window.inner_size();
     let instance = wgpu::Instance::new();
-    let surface = instance.create_surface(&window);
+    let surface = unsafe { instance.create_surface(&window) };
     let adapter = instance
         .request_adapter(
             &wgpu::RequestAdapterOptions {
@@ -26,7 +26,8 @@ async fn run(event_loop: EventLoop<()>, window: Window, swapchain_format: wgpu::
             },
             limits: wgpu::Limits::default(),
         })
-        .await;
+        .await
+        .unwrap();
 
     let vs = include_bytes!("shader.vert.spv");
     let vs_module =

src/backend/direct.rs

@@ -26,24 +26,6 @@ macro_rules! gfx_select {
     };
 }
 
-fn map_buffer_copy_view(view: crate::BufferCopyView<'_>) -> wgc::command::BufferCopyView {
-    wgc::command::BufferCopyView {
-        buffer: view.buffer.id,
-        offset: view.offset,
-        bytes_per_row: view.bytes_per_row,
-        rows_per_image: view.rows_per_image,
-    }
-}
-
-fn map_texture_copy_view<'a>(view: crate::TextureCopyView<'a>) -> wgc::command::TextureCopyView {
-    wgc::command::TextureCopyView {
-        texture: view.texture.id,
-        mip_level: view.mip_level,
-        array_layer: view.array_layer,
-        origin: view.origin,
-    }
-}
-
 pub type Context = wgc::hub::Global<wgc::hub::IdentityManagerFactory>;
 
 mod pass_impl {
@@ -184,6 +166,24 @@ mod pass_impl {
     }
 }
 
+fn map_buffer_copy_view(view: crate::BufferCopyView<'_>) -> wgc::command::BufferCopyView {
+    wgc::command::BufferCopyView {
+        buffer: view.buffer.id,
+        offset: view.offset,
+        bytes_per_row: view.bytes_per_row,
+        rows_per_image: view.rows_per_image,
+    }
+}
+
+fn map_texture_copy_view<'a>(view: crate::TextureCopyView<'a>) -> wgc::command::TextureCopyView {
+    wgc::command::TextureCopyView {
+        texture: view.texture.id,
+        mip_level: view.mip_level,
+        array_layer: view.array_layer,
+        origin: view.origin,
+    }
+}
+
 impl crate::Context for Context {
     type AdapterId = wgc::id::AdapterId;
     type DeviceId = wgc::id::DeviceId;
@@ -211,11 +211,12 @@ impl crate::Context for Context {
     type SwapChainOutputDetail = SwapChainOutputDetail;
 
     type RequestAdapterFuture = Ready<Option<Self::AdapterId>>;
-    type RequestDeviceFuture = Ready<(Self::DeviceId, Self::QueueId)>;
+    type RequestDeviceFuture =
+        Ready<Result<(Self::DeviceId, Self::QueueId), crate::RequestDeviceError>>;
     type MapReadFuture =
-        native_gpu_future::GpuFuture<Result<BufferReadMappingDetail, crate::BufferAsyncErr>>;
+        native_gpu_future::GpuFuture<Result<BufferReadMappingDetail, crate::BufferAsyncError>>;
     type MapWriteFuture =
-        native_gpu_future::GpuFuture<Result<BufferWriteMappingDetail, crate::BufferAsyncErr>>;
+        native_gpu_future::GpuFuture<Result<BufferWriteMappingDetail, crate::BufferAsyncError>>;
 
     fn init() -> Self {
         wgc::hub::Global::new("wgpu", wgc::hub::IdentityManagerFactory)
@@ -319,7 +320,7 @@ impl crate::Context for Context {
     ) -> Self::RequestDeviceFuture {
         let device_id =
             gfx_select!(*adapter => self.adapter_request_device(*adapter, desc, PhantomData));
-        ready((device_id, device_id))
+        ready(Ok((device_id, device_id)))
     }
 
     fn device_create_swap_chain(
@@ -694,7 +695,7 @@ impl crate::Context for Context {
                     buffer_id,
                 }));
             } else {
-                completion.complete(Err(crate::BufferAsyncErr));
+                completion.complete(Err(crate::BufferAsyncError));
             }
         }
 
@@ -731,7 +732,7 @@ impl crate::Context for Context {
                     buffer_id,
                 }));
             } else {
-                completion.complete(Err(crate::BufferAsyncErr));
+                completion.complete(Err(crate::BufferAsyncError));
             }
         }
 

src/backend/mod.rs

@@ -1,7 +1,7 @@
 #[cfg(target_arch = "wasm32")]
 mod web;
-//#[cfg(target_arch = "wasm32")]
-//pub use web::*;
+#[cfg(target_arch = "wasm32")]
+pub(crate) use web::Context;
 
 #[cfg(not(target_arch = "wasm32"))]
 mod direct;