Add DeviceError

hannobraun · Sep 29, 2023 · f8bcfd4 · f8bcfd4
1 parent 0452802
commit f8bcfd4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/crates/fj-viewer/src/graphics/device.rs b/crates/fj-viewer/src/graphics/device.rs
@@ -7,7 +7,7 @@ pub struct Device {
 impl Device {
     pub async fn new(
         adapter: &wgpu::Adapter,
-    ) -> Result<(Self, wgpu::Features), wgpu::RequestDeviceError> {
+    ) -> Result<(Self, wgpu::Features), DeviceError> {
         let features = {
             let desired_features = wgpu::Features::POLYGON_MODE_LINE;
             let available_features = adapter.features();
@@ -49,3 +49,11 @@ impl Device {
         Ok((Device { device, queue }, features))
     }
 }
+
+/// Render device initialization error
+#[derive(Debug, thiserror::Error)]
+pub enum DeviceError {
+    /// Failed to request device
+    #[error("Failed to request device")]
+    RequestDevice(#[from] wgpu::RequestDeviceError),
+}
diff --git a/crates/fj-viewer/src/graphics/mod.rs b/crates/fj-viewer/src/graphics/mod.rs
@@ -15,6 +15,7 @@ mod uniforms;
 mod vertices;
 
 pub use self::{
+    device::DeviceError,
     draw_config::DrawConfig,
     renderer::{DrawError, Renderer, RendererInitError},
 };

diff --git a/crates/fj-viewer/src/graphics/renderer.rs b/crates/fj-viewer/src/graphics/renderer.rs
@@ -13,7 +13,7 @@ use super::{
     device::Device, draw_config::DrawConfig, drawables::Drawables,
     geometries::Geometries, navigation_cube::NavigationCubeRenderer,
     pipelines::Pipelines, transform::Transform, uniforms::Uniforms,
-    vertices::Vertices, DEPTH_FORMAT, SAMPLE_COUNT,
+    vertices::Vertices, DeviceError, DEPTH_FORMAT, SAMPLE_COUNT,
 };
 
 /// Graphics rendering state and target abstraction
@@ -378,11 +378,9 @@ pub enum RendererInitError {
     #[error("Error request adapter")]
     RequestAdapter,
 
-    /// Device request errors
-    ///
-    /// See: [wgpu::RequestDeviceError](https://docs.rs/wgpu/latest/wgpu/struct.RequestDeviceError.html)
-    #[error("Error requesting device")]
-    RequestDevice(#[from] wgpu::RequestDeviceError),
+    /// Device error
+    #[error(transparent)]
+    Device(#[from] DeviceError),
 }
 
 /// Draw error

diff --git a/crates/fj-viewer/src/lib.rs b/crates/fj-viewer/src/lib.rs
@@ -18,7 +18,7 @@ mod screen;
 mod viewer;
 
 pub use self::{
-    graphics::RendererInitError,
+    graphics::{DeviceError, RendererInitError},
     input::InputEvent,
     screen::{NormalizedScreenPosition, Screen, ScreenSize},
     viewer::Viewer,