Refactor to prepare for follow-on change

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

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/crates/fj-viewer/src/graphics/device.rs b/crates/fj-viewer/src/graphics/device.rs
@@ -53,6 +53,10 @@ impl Device {
 /// Render device initialization error
 #[derive(Debug, thiserror::Error)]
 pub enum DeviceError {
+    /// Failed to request adapter
+    #[error("Failed to request adapter")]
+    RequestAdapter,
+
     /// Failed to request device
     #[error("Failed to request device")]
     RequestDevice(#[from] wgpu::RequestDeviceError),

diff --git a/crates/fj-viewer/src/graphics/renderer.rs b/crates/fj-viewer/src/graphics/renderer.rs
@@ -57,7 +57,7 @@ impl Renderer {
                 compatible_surface: Some(&surface),
             })
             .await
-            .ok_or(RendererInitError::RequestAdapter)?;
+            .ok_or(RendererInitError::Device(DeviceError::RequestAdapter))?;
 
         debug!("Using adapter: {:?}", adapter.get_info());
 
@@ -374,10 +374,6 @@ pub enum RendererInitError {
     #[error("Error creating surface")]
     CreateSurface(#[from] wgpu::CreateSurfaceError),
 
-    /// Graphics accelerator acquisition error
-    #[error("Error request adapter")]
-    RequestAdapter,
-
     /// Device error
     #[error(transparent)]
     Device(#[from] DeviceError),