Make ImageFormat::from_wgpu's signature non-total (#783)

Fixes #781
linebender · Jan 7, 2025 · 382e5d8 · 382e5d8
1 parent de6c60b
commit 382e5d8
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 13 deletions.
diff --git a/vello/src/lib.rs b/vello/src/lib.rs
@@ -432,7 +432,8 @@ impl Renderer {
         engine.build_shaders_if_needed(device, options.num_init_threads);
         let blit = options
             .surface_format
-            .map(|surface_format| BlitPipeline::new(device, surface_format, &mut engine));
+            .map(|surface_format| BlitPipeline::new(device, surface_format, &mut engine))
+            .transpose()?;
         #[cfg(feature = "debug_layers")]
         let debug = options
             .surface_format
@@ -520,11 +521,17 @@ impl Renderer {
             .as_ref()
             .expect("renderer should have configured surface_format to use on a surface");
         let mut recording = Recording::default();
-        let target_proxy = ImageProxy::new(width, height, ImageFormat::from_wgpu(target.format));
+        let target_proxy = ImageProxy::new(
+            width,
+            height,
+            ImageFormat::from_wgpu(target.format)
+                .expect("`TargetTexture` always has a supported texture format"),
+        );
         let surface_proxy = ImageProxy::new(
             width,
             height,
-            ImageFormat::from_wgpu(surface.texture.format()),
+            ImageFormat::from_wgpu(surface.texture.format())
+                .ok_or(Error::UnsupportedSurfaceFormat)?,
         );
         recording.draw(recording::DrawParams {
             shader_id: blit.0,
@@ -597,7 +604,8 @@ impl Renderer {
         let blit = self
             .options
             .surface_format
-            .map(|surface_format| BlitPipeline::new(device, surface_format, &mut engine));
+            .map(|surface_format| BlitPipeline::new(device, surface_format, &mut engine))
+            .transpose()?;
         #[cfg(feature = "debug_layers")]
         let debug = self
             .options
@@ -782,11 +790,17 @@ impl Renderer {
             .as_ref()
             .expect("renderer should have configured surface_format to use on a surface");
         let mut recording = Recording::default();
-        let target_proxy = ImageProxy::new(width, height, ImageFormat::from_wgpu(target.format));
+        let target_proxy = ImageProxy::new(
+            width,
+            height,
+            ImageFormat::from_wgpu(target.format)
+                .expect("`TargetTexture` always has a supported texture format"),
+        );
         let surface_proxy = ImageProxy::new(
             width,
             height,
-            ImageFormat::from_wgpu(surface.texture.format()),
+            ImageFormat::from_wgpu(surface.texture.format())
+                .ok_or(Error::UnsupportedSurfaceFormat)?,
         );
         recording.draw(recording::DrawParams {
             shader_id: blit.0,
@@ -899,7 +913,7 @@ struct BlitPipeline(ShaderId);
 
 #[cfg(feature = "wgpu")]
 impl BlitPipeline {
-    fn new(device: &Device, format: TextureFormat, engine: &mut WgpuEngine) -> Self {
+    fn new(device: &Device, format: TextureFormat, engine: &mut WgpuEngine) -> Result<Self> {
         const SHADERS: &str = r#"
             @vertex
             fn vs_main(@builtin(vertex_index) ix: u32) -> @builtin(position) vec4<f32> {
@@ -947,11 +961,13 @@ impl BlitPipeline {
             },
             None,
             &[(
-                BindType::ImageRead(ImageFormat::from_wgpu(format)),
+                BindType::ImageRead(
+                    ImageFormat::from_wgpu(format).ok_or(Error::UnsupportedSurfaceFormat)?,
+                ),
                 wgpu::ShaderStages::FRAGMENT,
             )],
         );
-        Self(shader_id)
+        Ok(Self(shader_id))
     }
 }
 

diff --git a/vello/src/recording.rs b/vello/src/recording.rs
@@ -247,11 +247,11 @@ impl ImageFormat {
     }
 
     #[cfg(feature = "wgpu")]
-    pub fn from_wgpu(format: wgpu::TextureFormat) -> Self {
+    pub fn from_wgpu(format: wgpu::TextureFormat) -> Option<Self> {
         match format {
-            wgpu::TextureFormat::Rgba8Unorm => Self::Rgba8,
-            wgpu::TextureFormat::Bgra8Unorm => Self::Bgra8,
-            _ => unimplemented!(),
+            wgpu::TextureFormat::Rgba8Unorm => Some(Self::Rgba8),
+            wgpu::TextureFormat::Bgra8Unorm => Some(Self::Bgra8),
+            _ => None,
         }
     }
 }