nordic-dev.net/vulkano
nordic-dev.net/vulkano
2
0
Fork 0
mirror of https://github.com/vulkano-rs/vulkano.git synced 2024-11-21 22:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove DescriptorBufferContentDesc (#630)

Browse Source 
* Remove DescriptorBufferContentDesc

* Update vulkano-shaders

* Fix tests
This commit is contained in:
tomaka 2017-07-28 07:19:22 +02:00 committed by GitHub
parent 284bc8965c
commit be298f470c
5 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vulkano-shaders/src/descriptor_sets.rs
View File

@ -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))

2
vulkano-shaders/src/lib.rs
View File

@ -89,8 +89,6 @@ pub fn reflect<R>(name: &str, mut spirv: R) -> Result<String, Error>
#[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;

13
vulkano/src/descriptor/descriptor.rs
View File

@ -376,19 +376,6 @@ impl DescriptorImageDescDimensions {
pub struct DescriptorBufferDesc {
pub dynamic: Option<bool>,
pub storage: bool,
pub content: DescriptorBufferContentDesc,
}
// TODO: documentation
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum DescriptorBufferContentDesc {
F32,
F64,
Struct {},
Array {
len: Box<DescriptorBufferContentDesc>,
num_array: usize,
},
}
/// Describes what kind of resource may later be bound to a descriptor.

3
vulkano/src/descriptor/descriptor_set/sys.rs
View File

@ -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(),

2
vulkano/src/descriptor/descriptor_set/unsafe_layout.rs
View File

@ -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(),