mitchellhansen/shade_runner
1
0
Fork 0
mirror of synced 2025-11-09 12:57:13 +00:00
Code Issues Releases Wiki Activity

add msg to unimplemented error

Browse Source
This commit is contained in:
Tom Gowan
2019-05-02 20:00:25 +10:00
parent f753563525
commit ac7992e139
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/error.rs
View File

@@ -8,7 +8,7 @@ pub enum Error {
#[derive(Debug)] #[derive(Debug)]
pub enum ConvertError { pub enum ConvertError {
Unimplemented, Unimplemented(String),
} }
#[derive(Debug)] #[derive(Debug)]

10
src/srvk.rs
View File

@@ -26,13 +26,13 @@ impl TryFrom<DescriptorDescInfo> for SpirvTy<DescriptorDescTy> {
use sr::types::ReflectDescriptorType as SR; use sr::types::ReflectDescriptorType as SR;
use DescriptorDescTy as VK; use DescriptorDescTy as VK;
match d.descriptor_type { match d.descriptor_type {
SR::Undefined => Err(ConvertError::Unimplemented), SR::Undefined => Err(ConvertError::Unimplemented(format!("{:?}", d.descriptor_type))),
SR::Sampler => Ok(VK::Sampler), SR::Sampler => Ok(VK::Sampler),
SR::CombinedImageSampler => Ok(VK::CombinedImageSampler( SR::CombinedImageSampler => Ok(VK::CombinedImageSampler(
SpirvTy::try_from(d.image)?.inner(), SpirvTy::try_from(d.image)?.inner(),
)), )),
SR::SampledImage => Ok(VK::Image(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 { SR::UniformTexelBuffer => Ok(VK::TexelBuffer {
storage: false, storage: false,
format: None, format: None,
@@ -46,7 +46,7 @@ impl TryFrom<DescriptorDescInfo> for SpirvTy<DescriptorDescTy> {
SR::UniformBufferDynamic => Ok(VK::Buffer(DescriptorBufferDesc{ dynamic: Some(true), storage: false })), SR::UniformBufferDynamic => Ok(VK::Buffer(DescriptorBufferDesc{ dynamic: Some(true), storage: false })),
SR::StorageBufferDynamic => Ok(VK::Buffer(DescriptorBufferDesc{ dynamic: Some(true), storage: true })), SR::StorageBufferDynamic => Ok(VK::Buffer(DescriptorBufferDesc{ dynamic: Some(true), storage: true })),
SR::InputAttachment => Ok(SpirvTy::try_from(d.image)?.inner()), 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(|t| SpirvTy { inner: t })
.map_err(Error::Layout) .map_err(Error::Layout)
@@ -107,7 +107,7 @@ impl TryFrom<sr::types::variable::ReflectDimension> for SpirvTy<DescriptorImageD
Type2d => Ok(TwoDimensional), Type2d => Ok(TwoDimensional),
Type3d => Ok(ThreeDimensional), Type3d => Ok(ThreeDimensional),
sr::types::variable::ReflectDimension::Cube => Ok(DescriptorImageDescDimensions::Cube), sr::types::variable::ReflectDimension::Cube => Ok(DescriptorImageDescDimensions::Cube),
_ => Err(ConvertError::Unimplemented), _ => Err(ConvertError::Unimplemented(format!("{:?}", d))),
} }
.map(|t| SpirvTy { inner: t }) .map(|t| SpirvTy { inner: t })
.map_err(Error::Layout) .map_err(Error::Layout)
@@ -174,7 +174,7 @@ impl TryFrom<sr::types::ReflectFormat> for SpirvTy<Format> {
use sr::types::ReflectFormat::*; use sr::types::ReflectFormat::*;
use Format::*; use Format::*;
let t = match f { let t = match f {
Undefined => Err(Error::Layout(ConvertError::Unimplemented))?, Undefined => Err(Error::Layout(ConvertError::Unimplemented(format!("{:?}", f))))?,
R32_UINT => R32Uint, R32_UINT => R32Uint,
R32_SINT => R32Sint, R32_SINT => R32Sint,
R32_SFLOAT => R32Sfloat, R32_SFLOAT => R32Sfloat,