From ac7992e1394f4ea55d37120f34d048173e2b75ef Mon Sep 17 00:00:00 2001 From: Tom Gowan Date: Thu, 2 May 2019 20:00:25 +1000 Subject: [PATCH] add msg to unimplemented error --- src/error.rs | 2 +- src/srvk.rs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/error.rs b/src/error.rs index 7b5937f..88c141f 100644 --- a/src/error.rs +++ b/src/error.rs @@ -8,7 +8,7 @@ pub enum Error { #[derive(Debug)] pub enum ConvertError { - Unimplemented, + Unimplemented(String), } #[derive(Debug)] diff --git a/src/srvk.rs b/src/srvk.rs index 06fbf3f..e907abd 100644 --- a/src/srvk.rs +++ b/src/srvk.rs @@ -26,13 +26,13 @@ impl TryFrom for SpirvTy { use sr::types::ReflectDescriptorType as SR; use DescriptorDescTy as VK; match d.descriptor_type { - SR::Undefined => Err(ConvertError::Unimplemented), + SR::Undefined => Err(ConvertError::Unimplemented(format!("{:?}", d.descriptor_type))), SR::Sampler => Ok(VK::Sampler), SR::CombinedImageSampler => Ok(VK::CombinedImageSampler( SpirvTy::try_from(d.image)?.inner(), )), SR::SampledImage => Ok(VK::Image(SpirvTy::try_from(d.image)?.inner())), - SR::StorageImage => Err(ConvertError::Unimplemented), + SR::StorageImage => Err(ConvertError::Unimplemented(format!("{:?}", d.descriptor_type))), SR::UniformTexelBuffer => Ok(VK::TexelBuffer { storage: false, format: None, @@ -46,7 +46,7 @@ impl TryFrom for SpirvTy { SR::UniformBufferDynamic => Ok(VK::Buffer(DescriptorBufferDesc{ dynamic: Some(true), storage: false })), SR::StorageBufferDynamic => Ok(VK::Buffer(DescriptorBufferDesc{ dynamic: Some(true), storage: true })), SR::InputAttachment => Ok(SpirvTy::try_from(d.image)?.inner()), - SR::AccelerationStructureNV => Err(ConvertError::Unimplemented), + SR::AccelerationStructureNV=> Err(ConvertError::Unimplemented(format!("{:?}", d.descriptor_type))), } .map(|t| SpirvTy { inner: t }) .map_err(Error::Layout) @@ -107,7 +107,7 @@ impl TryFrom for SpirvTy Ok(TwoDimensional), Type3d => Ok(ThreeDimensional), sr::types::variable::ReflectDimension::Cube => Ok(DescriptorImageDescDimensions::Cube), - _ => Err(ConvertError::Unimplemented), + _ => Err(ConvertError::Unimplemented(format!("{:?}", d))), } .map(|t| SpirvTy { inner: t }) .map_err(Error::Layout) @@ -174,7 +174,7 @@ impl TryFrom for SpirvTy { use sr::types::ReflectFormat::*; use Format::*; let t = match f { - Undefined => Err(Error::Layout(ConvertError::Unimplemented))?, + Undefined => Err(Error::Layout(ConvertError::Unimplemented(format!("{:?}", f))))?, R32_UINT => R32Uint, R32_SINT => R32Sint, R32_SFLOAT => R32Sfloat,