remove DeviceError::ResourceCreationFailed

Author: teoxoy

wgpu-core/src/device/mod.rs

@@ -336,17 +336,14 @@ pub enum DeviceError {
     Lost,
     #[error("Not enough memory left.")]
     OutOfMemory,
-    #[error("Creation of a resource failed for a reason other than running out of memory.")]
-    ResourceCreationFailed,
     #[error(transparent)]
     DeviceMismatch(#[from] Box<DeviceMismatch>),
 }
 
 impl WebGpuError for DeviceError {
     fn webgpu_error_type(&self) -> ErrorType {
         match self {
-            DeviceError::DeviceMismatch(e) => e.webgpu_error_type(),
-            Self::ResourceCreationFailed => ErrorType::OutOfMemory,
+            Self::DeviceMismatch(e) => e.webgpu_error_type(),
             Self::Lost => ErrorType::DeviceLost,
             Self::OutOfMemory => ErrorType::OutOfMemory,
         }
@@ -361,7 +358,6 @@ impl DeviceError {
         match error {
             hal::DeviceError::Lost => Self::Lost,
             hal::DeviceError::OutOfMemory => Self::OutOfMemory,
-            hal::DeviceError::ResourceCreationFailed => Self::ResourceCreationFailed,
             hal::DeviceError::Unexpected => Self::Lost,
         }
     }

wgpu-core/src/device/queue.rs

@@ -221,7 +221,6 @@ impl Drop for Queue {
                         self.device.handle_hal_error(e); // will lose the device
                         break;
                     }
-                    hal::DeviceError::ResourceCreationFailed => unreachable!(),
                     hal::DeviceError::Unexpected => {
                         panic!(
                             "We ran into an unexpected error while waiting on the last successful submission to complete!"

wgpu-core/src/device/resource.rs

@@ -378,7 +378,6 @@ impl Device {
         match error {
             hal::DeviceError::OutOfMemory
             | hal::DeviceError::Lost
-            | hal::DeviceError::ResourceCreationFailed
             | hal::DeviceError::Unexpected => {
                 self.lose(&error.to_string());
             }

wgpu-hal/src/gles/adapter.rs

@@ -996,7 +996,7 @@ impl crate::Adapter for super::Adapter {
         {
             Some(unsafe {
                 Self::create_shader_clear_program(gl, self.shared.es)
-                    .ok_or(crate::DeviceError::ResourceCreationFailed)?
+                    .ok_or(crate::DeviceError::Lost)?
             })
         } else {
             // If we don't need the workaround, don't waste time and resources compiling the clear program

wgpu-hal/src/lib.rs

@@ -375,8 +375,6 @@ pub enum DeviceError {
     OutOfMemory,
     #[error("Device is lost")]
     Lost,
-    #[error("Creation of a resource failed for a reason other than running out of memory.")]
-    ResourceCreationFailed,
     #[error("Unexpected error variant (driver implementation is at fault)")]
     Unexpected,
 }

wgpu-hal/src/metal/device.rs

@@ -1463,7 +1463,7 @@ impl crate::Device for super::Device {
                             Some(counter) => counter,
                             None => {
                                 log::error!("Failed to obtain timestamp counter set.");
-                                return Err(crate::DeviceError::ResourceCreationFailed);
+                                return Err(crate::DeviceError::Unexpected);
                             }
                         };
                     csb_desc.set_counter_set(timestamp_counter);
@@ -1473,7 +1473,7 @@ impl crate::Device for super::Device {
                             Ok(buffer) => buffer,
                             Err(err) => {
                                 log::error!("Failed to create counter sample buffer: {:?}", err);
-                                return Err(crate::DeviceError::ResourceCreationFailed);
+                                return Err(crate::DeviceError::Unexpected);
                             }
                         };
 

wgpu-hal/src/vulkan/device.rs

@@ -752,7 +752,7 @@ impl super::Device {
             .contains(wgt::Features::VULKAN_EXTERNAL_MEMORY_WIN32)
         {
             log::error!("Vulkan driver does not support VK_KHR_external_memory_win32");
-            return Err(crate::DeviceError::ResourceCreationFailed);
+            return Err(crate::DeviceError::Unexpected);
         }
 
         let mut external_memory_image_info = vk::ExternalMemoryImageCreateInfo::default()
@@ -780,7 +780,7 @@ impl super::Device {
                 image.requirements.memory_type_bits,
                 vk::MemoryPropertyFlags::DEVICE_LOCAL,
             )
-            .ok_or(crate::DeviceError::ResourceCreationFailed)?;
+            .ok_or(crate::DeviceError::Unexpected)?;
 
         let memory_allocate_info = vk::MemoryAllocateInfo::default()
             .allocation_size(image.requirements.size)