From be298f470caea37f5d85e6bfc449ab30c08ded86 Mon Sep 17 00:00:00 2001 From: tomaka Date: Fri, 28 Jul 2017 07:19:22 +0200 Subject: [PATCH] Remove DescriptorBufferContentDesc (#630) * Remove DescriptorBufferContentDesc * Update vulkano-shaders * Fix tests --- vulkano-shaders/src/descriptor_sets.rs | 1 - vulkano-shaders/src/lib.rs | 2 -- vulkano/src/descriptor/descriptor.rs | 13 ------------- vulkano/src/descriptor/descriptor_set/sys.rs | 3 --- .../src/descriptor/descriptor_set/unsafe_layout.rs | 2 -- 5 files changed, 21 deletions(-) diff --git a/vulkano-shaders/src/descriptor_sets.rs b/vulkano-shaders/src/descriptor_sets.rs index ef987dd2..1f0de101 100644 --- a/vulkano-shaders/src/descriptor_sets.rs +++ b/vulkano-shaders/src/descriptor_sets.rs @@ -286,7 +286,6 @@ fn descriptor_infos(doc: &parse::Spirv, pointed_ty: u32, force_combined_image_sa let desc = format!("DescriptorDescTy::Buffer(DescriptorBufferDesc {{ dynamic: Some(false), storage: {}, - content: DescriptorBufferContentDesc::F32, // FIXME: wrong }})", if is_ssbo { "true" } else { "false "}); Some((desc, true, 1)) diff --git a/vulkano-shaders/src/lib.rs b/vulkano-shaders/src/lib.rs index cb1fd397..f9e50987 100644 --- a/vulkano-shaders/src/lib.rs +++ b/vulkano-shaders/src/lib.rs @@ -89,8 +89,6 @@ pub fn reflect(name: &str, mut spirv: R) -> Result #[allow(unused_imports)] use vulkano::descriptor::descriptor::DescriptorBufferDesc; #[allow(unused_imports)] - use vulkano::descriptor::descriptor::DescriptorBufferContentDesc; - #[allow(unused_imports)] use vulkano::descriptor::descriptor::DescriptorImageDesc; #[allow(unused_imports)] use vulkano::descriptor::descriptor::DescriptorImageDescDimensions; diff --git a/vulkano/src/descriptor/descriptor.rs b/vulkano/src/descriptor/descriptor.rs index 81db1bc7..191f9cd6 100644 --- a/vulkano/src/descriptor/descriptor.rs +++ b/vulkano/src/descriptor/descriptor.rs @@ -376,19 +376,6 @@ impl DescriptorImageDescDimensions { pub struct DescriptorBufferDesc { pub dynamic: Option, pub storage: bool, - pub content: DescriptorBufferContentDesc, -} - -// TODO: documentation -#[derive(Debug, Clone, PartialEq, Eq)] -pub enum DescriptorBufferContentDesc { - F32, - F64, - Struct {}, - Array { - len: Box, - num_array: usize, - }, } /// Describes what kind of resource may later be bound to a descriptor. diff --git a/vulkano/src/descriptor/descriptor_set/sys.rs b/vulkano/src/descriptor/descriptor_set/sys.rs index d0fcc7b2..15486847 100644 --- a/vulkano/src/descriptor/descriptor_set/sys.rs +++ b/vulkano/src/descriptor/descriptor_set/sys.rs @@ -989,7 +989,6 @@ impl DescriptorWrite { #[cfg(test)] mod tests { - use descriptor::descriptor::DescriptorBufferContentDesc; use descriptor::descriptor::DescriptorBufferDesc; use descriptor::descriptor::DescriptorDesc; use descriptor::descriptor::DescriptorDescTy; @@ -1040,7 +1039,6 @@ mod tests { ty: DescriptorDescTy::Buffer(DescriptorBufferDesc { dynamic: Some(false), storage: false, - content: DescriptorBufferContentDesc::F32, }), array_count: 1, stages: ShaderStages::all_graphics(), @@ -1071,7 +1069,6 @@ mod tests { ty: DescriptorDescTy::Buffer(DescriptorBufferDesc { dynamic: Some(false), storage: false, - content: DescriptorBufferContentDesc::F32, }), array_count: 1, stages: ShaderStages::all_graphics(), diff --git a/vulkano/src/descriptor/descriptor_set/unsafe_layout.rs b/vulkano/src/descriptor/descriptor_set/unsafe_layout.rs index 1c68f689..0ed245a1 100644 --- a/vulkano/src/descriptor/descriptor_set/unsafe_layout.rs +++ b/vulkano/src/descriptor/descriptor_set/unsafe_layout.rs @@ -145,7 +145,6 @@ impl Drop for UnsafeDescriptorSetLayout { #[cfg(test)] mod tests { - use descriptor::descriptor::DescriptorBufferContentDesc; use descriptor::descriptor::DescriptorBufferDesc; use descriptor::descriptor::DescriptorDesc; use descriptor::descriptor::DescriptorDescTy; @@ -168,7 +167,6 @@ mod tests { ty: DescriptorDescTy::Buffer(DescriptorBufferDesc { dynamic: Some(false), storage: false, - content: DescriptorBufferContentDesc::F32, }), array_count: 1, stages: ShaderStages::all_graphics(),