mitchellhansen/shade_runner
1
0
Fork 0
mirror of synced 2025-11-10 05:17:13 +00:00
Code Issues Releases Wiki Activity

descriptor layout

Browse Source
This commit is contained in:
Tom Gowan
2019-04-26 15:24:58 +10:00
parent 0755b4f807
commit f3346e48bb
6 changed files with 278 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/srvk.rs
View File

@@ -1,7 +1,6 @@
use crate::sr;
use crate::vk;
use vk::descriptor::descriptor::*;
use vk::pipeline::shader::ShaderInterfaceDefEntry;
use vk::format::Format;
pub struct SpirvTy<T> {
@@ -9,8 +8,8 @@ pub struct SpirvTy<T> {
}
pub struct DescriptorDescInfo {
descriptor_type: sr::types::ReflectDescriptorType,
image: sr::types::ReflectImageTraits,
pub descriptor_type: sr::types::ReflectDescriptorType,
pub image: sr::types::ReflectImageTraits,
}
impl<T> SpirvTy<T> {
@@ -56,7 +55,9 @@ impl From<sr::types::ReflectImageTraits> for SpirvTy<DescriptorImageDesc> {
let t = DescriptorImageDesc {
sampled: d.sampled != 0,
dimensions: SpirvTy::from(d.dim).inner(),
format: Some(SpirvTy::from(d.image_format).inner()),
// TODO figure out how to do format correctly
//format: Some(SpirvTy::from(d.image_format).inner()),
format: None,
multisampled: d.ms != 0,
array_layers: conv_array_layers(d.arrayed, d.depth),
};
@@ -66,13 +67,67 @@ impl From<sr::types::ReflectImageTraits> for SpirvTy<DescriptorImageDesc> {
impl From<sr::types::variable::ReflectDimension> for SpirvTy<DescriptorImageDescDimensions> {
fn from(d: sr::types::variable::ReflectDimension) -> Self {
unimplemented!()
use sr::types::variable::ReflectDimension::*;
use DescriptorImageDescDimensions::*;
let inner = match d {
Type1d => OneDimensional,
Type2d => TwoDimensional,
Type3d => ThreeDimensional,
sr::types::variable::ReflectDimension::Cube => DescriptorImageDescDimensions::Cube,
_ => unimplemented!(),
};
SpirvTy{ inner }
}
}
// I think this is wrong and currently is unused
impl From<sr::types::image::ReflectImageFormat> for SpirvTy<Format> {
fn from(d: sr::types::image::ReflectImageFormat) -> Self {
unimplemented!()
use sr::types::image::ReflectImageFormat::*;
use Format::*;
let inner = match d {
Undefined => unimplemented!(),
RGBA32_FLOAT => R32G32B32A32Sfloat,
RGBA16_FLOAT => R16G16B16A16Sfloat,
R32_FLOAT => R32Sfloat,
RGBA8 => unimplemented!(),
RGBA8_SNORM => R8G8B8A8Snorm,
RG32_FLOAT => R32G32Sfloat,
RG16_FLOAT => R16G16Sfloat,
R11G11B10_FLOAT => unimplemented!(),
R16_FLOAT => R16Sfloat,
RGBA16 => unimplemented!(),
RGB10A2 => unimplemented!(),
RG16 => unimplemented!(),
RG8 => unimplemented!(),
R16 => unimplemented!(),
R8 => unimplemented!(),
RGBA16_SNORM => R16G16B16A16Snorm,
RG16_SNORM => R16G16Snorm,
RG8_SNORM => R8G8Snorm,
R16_SNORM => R16Snorm,
R8_SNORM => R8Snorm,
RGBA32_INT => R32G32B32A32Sint,
RGBA16_INT => R16G16B16A16Sint,
RGBA8_INT => R8G8B8A8Sint,
R32_INT => R32Sint,
RG32_INT => R32G32Sint,
RG16_INT => R16G16Sint,
RG8_INT => R8G8Sint,
R16_INT => R16Sint,
R8_INT => R8Sint,
RGBA32_UINT => R32G32B32A32Uint,
RGBA16_UINT => R16G16B16A16Uint,
RGBA8_UINT => R8G8B8A8Uint,
R32_UINT => R32Uint,
RGB10A2_UINT => A2R10G10B10UintPack32,
RG32_UINT => R32G32Uint,
RG16_UINT => R16G16Uint,
RG8_UINT => R8G8Uint,
R16_UINT =>R16Uint,
R8_UINT =>R8Uint,
};
SpirvTy{ inner }
}
}