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

Rename descriptor_set to descriptor

Browse Source
This commit is contained in:
Pierre Krieger 2016-04-04 09:50:02 +02:00
parent a5852f8580
commit 74fc2ffb94
17 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,15 +70,15 @@ pub fn reflect<R>(name: &str, mut spirv: R) -> Result<String, Error>
use std::vec::IntoIter as VecIntoIter;
use vulkano::device::Device;
use vulkano::descriptor_set::descriptor::DescriptorDesc;
use vulkano::descriptor_set::descriptor::DescriptorType;
use vulkano::descriptor_set::descriptor::ShaderStages;
use vulkano::descriptor_set::descriptor_set::DescriptorSet;
use vulkano::descriptor_set::descriptor_set::UnsafeDescriptorSet;
use vulkano::descriptor_set::descriptor_set::UnsafeDescriptorSetLayout;
use vulkano::descriptor_set::pipeline_layout::PipelineLayout;
use vulkano::descriptor_set::pipeline_layout::PipelineLayoutDesc;
use vulkano::descriptor_set::pipeline_layout::UnsafePipelineLayout;
use vulkano::descriptor::descriptor::DescriptorDesc;
use vulkano::descriptor::descriptor::DescriptorType;
use vulkano::descriptor::descriptor::ShaderStages;
use vulkano::descriptor::descriptor_set::DescriptorSet;
use vulkano::descriptor::descriptor_set::UnsafeDescriptorSet;
use vulkano::descriptor::descriptor_set::UnsafeDescriptorSetLayout;
use vulkano::descriptor::pipeline_layout::PipelineLayout;
use vulkano::descriptor::pipeline_layout::PipelineLayoutDesc;
use vulkano::descriptor::pipeline_layout::UnsafePipelineLayout;
"#);
{

2
vulkano/examples/image.rs
View File

@ -155,7 +155,7 @@ fn main() {
vulkano::sampler::SamplerAddressMode::Repeat,
0.0, 1.0, 0.0, 0.0).unwrap();
let descriptor_pool = vulkano::descriptor_set::descriptor_set::DescriptorPool::new(&device).unwrap();
let descriptor_pool = vulkano::descriptor::descriptor_set::DescriptorPool::new(&device).unwrap();
mod pipeline_layout {
pipeline_layout!{
set0: {

2
vulkano/examples/teapot.rs
View File

@ -160,7 +160,7 @@ fn main() {
let renderpass = renderpass::CustomRenderPass::new(&device).unwrap();
let descriptor_pool = vulkano::descriptor_set::descriptor_set::DescriptorPool::new(&device).unwrap();
let descriptor_pool = vulkano::descriptor::descriptor_set::DescriptorPool::new(&device).unwrap();
mod pipeline_layout {
pipeline_layout!{

4
vulkano/src/command_buffer/inner.rs
View File

@ -25,8 +25,8 @@ use buffer::TypedBuffer;
use buffer::traits::AccessRange as BufferAccessRange;
use command_buffer::CommandBufferPool;
use command_buffer::DynamicState;
use descriptor_set::descriptor_set::DescriptorSetsCollection;
use descriptor_set::PipelineLayout;
use descriptor::descriptor_set::DescriptorSetsCollection;
use descriptor::PipelineLayout;
use device::Queue;
use format::ClearValue;
use format::FormatDesc;

4
vulkano/src/command_buffer/outer.rs
View File

@ -19,8 +19,8 @@ use command_buffer::inner::InnerCommandBufferBuilder;
use command_buffer::inner::InnerCommandBuffer;
use command_buffer::inner::Submission;
use command_buffer::inner::submit as inner_submit;
use descriptor_set::descriptor_set::DescriptorSetsCollection;
use descriptor_set::PipelineLayout;
use descriptor::descriptor_set::DescriptorSetsCollection;
use descriptor::PipelineLayout;
use device::Queue;
use framebuffer::Framebuffer;
use framebuffer::UnsafeRenderPass;

0
vulkano/src/descriptor_set/descriptor.rs → vulkano/src/descriptor/descriptor.rs
View File

2
vulkano/src/descriptor_set/descriptor_set/collection.rs → vulkano/src/descriptor/descriptor_set/collection.rs
View File

@ -13,7 +13,7 @@ use std::option::IntoIter as OptionIntoIter;
use std::sync::Arc;
//use std::vec::IntoIter as VecIntoIter;
use descriptor_set::descriptor_set::DescriptorSet;
use descriptor::descriptor_set::DescriptorSet;
/// A collection of descriptor set objects.
pub unsafe trait DescriptorSetsCollection {

0
vulkano/src/descriptor_set/descriptor_set/mod.rs → vulkano/src/descriptor/descriptor_set/mod.rs
View File

2
vulkano/src/descriptor_set/descriptor_set/pool.rs → vulkano/src/descriptor/descriptor_set/pool.rs
View File

@ -112,7 +112,7 @@ impl Drop for DescriptorPool {
#[cfg(test)]
mod tests {
use descriptor_set::DescriptorPool;
use descriptor::DescriptorPool;
#[test]
fn create() {

8
vulkano/src/descriptor_set/descriptor_set/sys.rs → vulkano/src/descriptor/descriptor_set/sys.rs
View File

@ -20,10 +20,10 @@ use VulkanPointers;
use vk;
use buffer::Buffer;
use descriptor_set::descriptor::DescriptorWrite;
use descriptor_set::descriptor::DescriptorWriteInner;
use descriptor_set::descriptor_set::UnsafeDescriptorSetLayout;
use descriptor_set::descriptor_set::DescriptorPool;
use descriptor::descriptor::DescriptorWrite;
use descriptor::descriptor::DescriptorWriteInner;
use descriptor::descriptor_set::UnsafeDescriptorSetLayout;
use descriptor::descriptor_set::DescriptorPool;
use device::Device;
use image::Image;
use image::ImageView;

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

@ -18,7 +18,7 @@ use VulkanObject;
use VulkanPointers;
use vk;
use descriptor_set::descriptor::DescriptorDesc;
use descriptor::descriptor::DescriptorDesc;
use device::Device;
/// Describes the layout of all descriptors within a descriptor set.

0
vulkano/src/descriptor_set/mod.rs → vulkano/src/descriptor/mod.rs
View File

36
vulkano/src/descriptor_set/pipeline_layout/custom_pipeline_macro.rs → vulkano/src/descriptor/pipeline_layout/custom_pipeline_macro.rs
View File

@ -11,8 +11,8 @@ use std::marker::PhantomData;
use std::sync::Arc;
use buffer::TypedBuffer;
use descriptor_set::descriptor::DescriptorType;
use descriptor_set::descriptor::DescriptorWrite;
use descriptor::descriptor::DescriptorType;
use descriptor::descriptor::DescriptorWrite;
use image::ImageView;
use sampler::Sampler;
@ -23,10 +23,10 @@ macro_rules! pipeline_layout {
use std::vec::IntoIter as VecIntoIter;
use $crate::OomError;
use $crate::device::Device;
use $crate::descriptor_set::descriptor::DescriptorDesc;
use $crate::descriptor_set::pipeline_layout::PipelineLayout;
use $crate::descriptor_set::pipeline_layout::PipelineLayoutDesc;
use $crate::descriptor_set::pipeline_layout::UnsafePipelineLayout;
use $crate::descriptor::descriptor::DescriptorDesc;
use $crate::descriptor::pipeline_layout::PipelineLayout;
use $crate::descriptor::pipeline_layout::PipelineLayoutDesc;
use $crate::descriptor::pipeline_layout::UnsafePipelineLayout;
pub struct CustomPipeline {
inner: UnsafePipelineLayout
@ -79,18 +79,18 @@ macro_rules! pipeline_layout {
use super::CustomPipeline;
use $crate::OomError;
use $crate::device::Device;
use $crate::descriptor_set::descriptor::DescriptorDesc;
use $crate::descriptor_set::descriptor::DescriptorWrite;
use $crate::descriptor_set::descriptor::ShaderStages;
use $crate::descriptor_set::descriptor_set::DescriptorPool;
use $crate::descriptor_set::descriptor_set::DescriptorSet;
use $crate::descriptor_set::descriptor_set::UnsafeDescriptorSet;
use $crate::descriptor_set::descriptor_set::UnsafeDescriptorSetLayout;
use $crate::descriptor_set::pipeline_layout::PipelineLayout;
use $crate::descriptor_set::pipeline_layout::custom_pipeline_macro::CombinedImageSampler;
use $crate::descriptor_set::pipeline_layout::custom_pipeline_macro::DescriptorMarker;
use $crate::descriptor_set::pipeline_layout::custom_pipeline_macro::UniformBuffer;
use $crate::descriptor_set::pipeline_layout::custom_pipeline_macro::ValidParameter;
use $crate::descriptor::descriptor::DescriptorDesc;
use $crate::descriptor::descriptor::DescriptorWrite;
use $crate::descriptor::descriptor::ShaderStages;
use $crate::descriptor::descriptor_set::DescriptorPool;
use $crate::descriptor::descriptor_set::DescriptorSet;
use $crate::descriptor::descriptor_set::UnsafeDescriptorSet;
use $crate::descriptor::descriptor_set::UnsafeDescriptorSetLayout;
use $crate::descriptor::pipeline_layout::PipelineLayout;
use $crate::descriptor::pipeline_layout::custom_pipeline_macro::CombinedImageSampler;
use $crate::descriptor::pipeline_layout::custom_pipeline_macro::DescriptorMarker;
use $crate::descriptor::pipeline_layout::custom_pipeline_macro::UniformBuffer;
use $crate::descriptor::pipeline_layout::custom_pipeline_macro::ValidParameter;
// This constant is part of the API, but Rust sees it as dead code.
#[allow(dead_code)]

6
vulkano/src/descriptor_set/pipeline_layout/mod.rs → vulkano/src/descriptor/pipeline_layout/mod.rs
View File

@ -18,9 +18,9 @@ use VulkanObject;
use VulkanPointers;
use vk;
use descriptor_set::descriptor::DescriptorDesc;
use descriptor_set::descriptor_set::DescriptorSetsCollection;
use descriptor_set::descriptor_set::UnsafeDescriptorSetLayout;
use descriptor::descriptor::DescriptorDesc;
use descriptor::descriptor_set::DescriptorSetsCollection;
use descriptor::descriptor_set::UnsafeDescriptorSetLayout;
use device::Device;
pub mod custom_pipeline_macro;

2
vulkano/src/lib.rs
View File

@ -60,7 +60,7 @@ mod version;
pub mod buffer;
pub mod command_buffer;
pub mod descriptor_set;
pub mod descriptor;
pub mod device;
pub mod format;
pub mod framebuffer;

6
vulkano/src/pipeline/compute_pipeline.rs
View File

@ -11,9 +11,9 @@ use std::mem;
use std::ptr;
use std::sync::Arc;
use descriptor_set::PipelineLayout;
//use descriptor_set::pipeline_layout::PipelineLayoutDesc;
//use descriptor_set::pipeline_layout::PipelineLayoutSuperset;
use descriptor::PipelineLayout;
//use descriptor::pipeline_layout::PipelineLayoutDesc;
//use descriptor::pipeline_layout::PipelineLayoutSuperset;
use pipeline::shader::ComputeShaderEntryPoint;
use device::Device;

6
vulkano/src/pipeline/graphics_pipeline.rs
View File

@ -13,9 +13,9 @@ use std::sync::Arc;
use smallvec::SmallVec;
use device::Device;
use descriptor_set::PipelineLayout;
use descriptor_set::pipeline_layout::PipelineLayoutDesc;
use descriptor_set::pipeline_layout::PipelineLayoutSuperset;
use descriptor::PipelineLayout;
use descriptor::pipeline_layout::PipelineLayoutDesc;
use descriptor::pipeline_layout::PipelineLayoutSuperset;
use framebuffer::RenderPass;
use framebuffer::Subpass;
use OomError;