nordic-dev.net/vulkano
nordic-dev.net/vulkano
2
0
Fork 0
mirror of https://github.com/vulkano-rs/vulkano.git synced 2024-10-30 05:52:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor AllocationCreateInfo (#2174)

Browse Source 
* Refactor `AllocationCreateInfo`

* `debug_assert` -> `assert`
This commit is contained in:
marc0246 2023-04-02 15:07:16 +02:00 committed by GitHub
parent 02034e87d7
commit 59be815314
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 689 additions and 469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/src/bin/basic-compute-shader.rs
View File

@ -14,7 +14,7 @@
// GPU", or *GPGPU*. This is what this example demonstrates.
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage},
buffer::{Buffer, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
},
@ -26,7 +26,7 @@ use vulkano::{
QueueFlags,
},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{ComputePipeline, Pipeline, PipelineBindPoint},
sync::{self, GpuFuture},
VulkanLibrary,
@ -154,8 +154,12 @@ fn main() {
// We start by creating the buffer that will store the data.
let data_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::STORAGE_BUFFER,
BufferCreateInfo {
usage: BufferUsage::STORAGE_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
// Iterator that produces the data.

12
examples/src/bin/deferred/frame/ambient_lighting_system.rs
View File

@ -9,7 +9,7 @@
use std::sync::Arc;
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage, Subbuffer},
buffer::{Buffer, BufferCreateInfo, BufferUsage, Subbuffer},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder,
CommandBufferInheritanceInfo, CommandBufferUsage, SecondaryAutoCommandBuffer,
@ -19,7 +19,7 @@ use vulkano::{
},
device::Queue,
image::ImageViewAbstract,
memory::allocator::MemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryAllocator, MemoryUsage},
pipeline::{
graphics::{
color_blend::{AttachmentBlend, BlendFactor, BlendOp, ColorBlendState},
@ -68,8 +68,12 @@ impl AmbientLightingSystem {
];
let vertex_buffer = Buffer::from_iter(
memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,

12
examples/src/bin/deferred/frame/directional_lighting_system.rs
View File

@ -10,7 +10,7 @@
use cgmath::Vector3;
use std::sync::Arc;
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage, Subbuffer},
buffer::{Buffer, BufferCreateInfo, BufferUsage, Subbuffer},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder,
CommandBufferInheritanceInfo, CommandBufferUsage, SecondaryAutoCommandBuffer,
@ -20,7 +20,7 @@ use vulkano::{
},
device::Queue,
image::ImageViewAbstract,
memory::allocator::MemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryAllocator, MemoryUsage},
pipeline::{
graphics::{
color_blend::{AttachmentBlend, BlendFactor, BlendOp, ColorBlendState},
@ -70,8 +70,12 @@ impl DirectionalLightingSystem {
let vertex_buffer = {
Buffer::from_iter(
memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,

12
examples/src/bin/deferred/frame/point_lighting_system.rs
View File

@ -10,7 +10,7 @@
use cgmath::{Matrix4, Vector3};
use std::sync::Arc;
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage, Subbuffer},
buffer::{Buffer, BufferCreateInfo, BufferUsage, Subbuffer},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder,
CommandBufferInheritanceInfo, CommandBufferUsage, SecondaryAutoCommandBuffer,
@ -20,7 +20,7 @@ use vulkano::{
},
device::Queue,
image::ImageViewAbstract,
memory::allocator::MemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryAllocator, MemoryUsage},
pipeline::{
graphics::{
color_blend::{AttachmentBlend, BlendFactor, BlendOp, ColorBlendState},
@ -68,8 +68,12 @@ impl PointLightingSystem {
];
let vertex_buffer = Buffer::from_iter(
memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,

12
examples/src/bin/deferred/triangle_draw_system.rs
View File

@ -9,13 +9,13 @@
use std::sync::Arc;
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage, Subbuffer},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder,
CommandBufferInheritanceInfo, CommandBufferUsage, SecondaryAutoCommandBuffer,
},
device::Queue,
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
depth_stencil::DepthStencilState,
@ -57,8 +57,12 @@ impl TriangleDrawSystem {
];
let vertex_buffer = Buffer::from_iter(
memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,

20
examples/src/bin/dynamic-buffers.rs
View File

@ -15,7 +15,7 @@
use std::{iter::repeat, mem::size_of};
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage},
buffer::{Buffer, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
},
@ -28,7 +28,7 @@ use vulkano::{
QueueFlags,
},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{ComputePipeline, Pipeline, PipelineBindPoint},
sync::{self, GpuFuture},
DeviceSize, VulkanLibrary,
@ -167,8 +167,12 @@ fn main() {
let input_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::UNIFORM_BUFFER,
BufferCreateInfo {
usage: BufferUsage::UNIFORM_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
aligned_data,
@ -177,8 +181,12 @@ fn main() {
let output_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::STORAGE_BUFFER,
BufferCreateInfo {
usage: BufferUsage::STORAGE_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
(0..12).map(|_| 0u32),

12
examples/src/bin/dynamic-local-size.rs
View File

@ -15,7 +15,7 @@
use std::{fs::File, io::BufWriter, path::Path};
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage},
buffer::{Buffer, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
CopyImageToBufferInfo,
@ -30,7 +30,7 @@ use vulkano::{
format::Format,
image::{view::ImageView, ImageDimensions, StorageImage},
instance::{Instance, InstanceCreateInfo, InstanceExtensions},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{ComputePipeline, Pipeline, PipelineBindPoint},
sync::{self, GpuFuture},
VulkanLibrary,
@ -220,8 +220,12 @@ fn main() {
let buf = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::TRANSFER_DST,
BufferCreateInfo {
usage: BufferUsage::TRANSFER_DST,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
(0..1024 * 1024 * 4).map(|_| 0u8),

12
examples/src/bin/gl-interop.rs
View File

@ -14,7 +14,7 @@ mod linux {
time::Instant,
};
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage, Subbuffer},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder,
CommandBufferUsage, RenderPassBeginInfo, SemaphoreSubmitInfo, SubmitInfo,
@ -33,7 +33,7 @@ mod linux {
debug::{DebugUtilsMessenger, DebugUtilsMessengerCreateInfo},
Instance, InstanceCreateInfo, InstanceExtensions,
},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
color_blend::ColorBlendState,
@ -570,8 +570,12 @@ mod linux {
];
let vertex_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,

20
examples/src/bin/image-self-copy-blit/main.rs
View File

@ -9,7 +9,7 @@
use std::{io::Cursor, sync::Arc};
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, BlitImageInfo,
BufferImageCopy, ClearColorImageInfo, CommandBufferUsage, CopyBufferToImageInfo,
@ -29,7 +29,7 @@ use vulkano::{
SwapchainImage,
},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
color_blend::ColorBlendState,
@ -182,8 +182,12 @@ fn main() {
];
let vertex_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,
@ -245,8 +249,12 @@ fn main() {
let buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::TRANSFER_SRC,
BufferCreateInfo {
usage: BufferUsage::TRANSFER_SRC,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
image_data,

12
examples/src/bin/image/main.rs
View File

@ -9,7 +9,7 @@
use std::{io::Cursor, sync::Arc};
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
PrimaryCommandBufferAbstract, RenderPassBeginInfo, SubpassContents,
@ -27,7 +27,7 @@ use vulkano::{
SwapchainImage,
},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
color_blend::ColorBlendState,
@ -180,8 +180,12 @@ fn main() {
];
let vertex_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,

12
examples/src/bin/immutable-sampler/main.rs
View File

@ -18,7 +18,7 @@
use std::{io::Cursor, sync::Arc};
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
PrimaryCommandBufferAbstract, RenderPassBeginInfo, SubpassContents,
@ -36,7 +36,7 @@ use vulkano::{
SwapchainImage,
},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
color_blend::ColorBlendState,
@ -186,8 +186,12 @@ fn main() {
];
let vertex_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,

20
examples/src/bin/instancing.rs
View File

@ -14,7 +14,7 @@
use std::sync::Arc;
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
RenderPassBeginInfo, SubpassContents,
@ -25,7 +25,7 @@ use vulkano::{
},
image::{view::ImageView, ImageAccess, ImageUsage, SwapchainImage},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
input_assembly::InputAssemblyState,
@ -186,8 +186,12 @@ fn main() {
let vertex_buffer = {
Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,
@ -220,8 +224,12 @@ fn main() {
};
let instance_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
instances,

20
examples/src/bin/interactive_fractal/fractal_compute_pipeline.rs
View File

@ -11,7 +11,7 @@ use cgmath::Vector2;
use rand::Rng;
use std::sync::Arc;
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage, Subbuffer},
buffer::{Buffer, BufferCreateInfo, BufferUsage, Subbuffer},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
PrimaryCommandBufferAbstract,
@ -21,7 +21,7 @@ use vulkano::{
},
device::Queue,
image::ImageAccess,
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{ComputePipeline, Pipeline, PipelineBindPoint},
sync::GpuFuture,
};
@ -57,8 +57,12 @@ impl FractalComputePipeline {
let palette_size = colors.len() as i32;
let palette = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::STORAGE_BUFFER,
BufferCreateInfo {
usage: BufferUsage::STORAGE_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
colors,
@ -102,8 +106,12 @@ impl FractalComputePipeline {
}
self.palette = Buffer::from_iter(
&self.memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::STORAGE_BUFFER,
BufferCreateInfo {
usage: BufferUsage::STORAGE_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
colors,

20
examples/src/bin/interactive_fractal/pixels_draw_pipeline.rs
View File

@ -9,7 +9,7 @@
use std::sync::Arc;
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage, Subbuffer},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder,
CommandBufferInheritanceInfo, CommandBufferUsage, SecondaryAutoCommandBuffer,
@ -19,7 +19,7 @@ use vulkano::{
},
device::Queue,
image::ImageViewAbstract,
memory::allocator::MemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryAllocator, MemoryUsage},
pipeline::{
graphics::{
input_assembly::InputAssemblyState,
@ -88,8 +88,12 @@ impl PixelsDrawPipeline {
let (vertices, indices) = textured_quad(2.0, 2.0);
let vertex_buffer = Buffer::from_iter(
memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,
@ -97,8 +101,12 @@ impl PixelsDrawPipeline {
.unwrap();
let index_buffer = Buffer::from_iter(
memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::INDEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::INDEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
indices,

20
examples/src/bin/msaa-renderpass.rs
View File

@ -64,7 +64,7 @@
use std::{fs::File, io::BufWriter, path::Path};
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
CopyImageToBufferInfo, PrimaryCommandBufferAbstract, RenderPassBeginInfo, SubpassContents,
@ -76,7 +76,7 @@ use vulkano::{
format::Format,
image::{view::ImageView, AttachmentImage, ImageDimensions, SampleCount, StorageImage},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
multisample::MultisampleState,
@ -286,8 +286,12 @@ fn main() {
];
let vertex_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,
@ -318,8 +322,12 @@ fn main() {
let buf = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::TRANSFER_DST,
BufferCreateInfo {
usage: BufferUsage::TRANSFER_DST,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
(0..1024 * 1024 * 4).map(|_| 0u8),

12
examples/src/bin/multi-window.rs
View File

@ -18,7 +18,7 @@
use std::{collections::HashMap, sync::Arc};
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
RenderPassBeginInfo, SubpassContents,
@ -29,7 +29,7 @@ use vulkano::{
},
image::{view::ImageView, ImageAccess, ImageUsage, SwapchainImage},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
input_assembly::InputAssemblyState,
@ -199,8 +199,12 @@ fn main() {
];
let vertex_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,

12
examples/src/bin/multi_window_game_of_life/game_of_life.rs
View File

@ -12,7 +12,7 @@ use cgmath::Vector2;
use rand::Rng;
use std::sync::Arc;
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage, Subbuffer},
buffer::{Buffer, BufferCreateInfo, BufferUsage, Subbuffer},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
PrimaryAutoCommandBuffer,
@ -23,7 +23,7 @@ use vulkano::{
device::Queue,
format::Format,
image::{ImageAccess, ImageUsage, StorageImage},
memory::allocator::MemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryAllocator, MemoryUsage},
pipeline::{ComputePipeline, Pipeline, PipelineBindPoint},
sync::GpuFuture,
};
@ -46,8 +46,12 @@ pub struct GameOfLifeComputePipeline {
fn rand_grid(memory_allocator: &impl MemoryAllocator, size: [u32; 2]) -> Subbuffer<[u32]> {
Buffer::from_iter(
memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::STORAGE_BUFFER,
BufferCreateInfo {
usage: BufferUsage::STORAGE_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
(0..(size[0] * size[1]))

19
examples/src/bin/multi_window_game_of_life/pixels_draw.rs
View File

@ -10,7 +10,7 @@
use crate::app::App;
use std::sync::Arc;
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage, Subbuffer},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder,
CommandBufferInheritanceInfo, CommandBufferUsage, SecondaryAutoCommandBuffer,
@ -20,6 +20,7 @@ use vulkano::{
},
device::Queue,
image::ImageViewAbstract,
memory::allocator::{AllocationCreateInfo, MemoryUsage},
pipeline::{
graphics::{
input_assembly::InputAssemblyState,
@ -83,8 +84,12 @@ impl PixelsDrawPipeline {
let memory_allocator = app.context.memory_allocator();
let vertex_buffer = Buffer::from_iter(
memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,
@ -92,8 +97,12 @@ impl PixelsDrawPipeline {
.unwrap();
let index_buffer = Buffer::from_iter(
memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::INDEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::INDEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
indices,

20
examples/src/bin/multiview.rs
View File

@ -14,7 +14,7 @@
use std::{fs::File, io::BufWriter, path::Path};
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage, Subbuffer},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, BufferImageCopy,
CommandBufferUsage, CopyImageToBufferInfo, RenderPassBeginInfo, SubpassContents,
@ -29,7 +29,7 @@ use vulkano::{
ImageSubresourceLayers, ImageUsage, SampleCount, StorageImage,
},
instance::{Instance, InstanceCreateInfo, InstanceExtensions},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
input_assembly::InputAssemblyState,
@ -166,8 +166,12 @@ fn main() {
];
let vertex_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,
@ -278,8 +282,12 @@ fn main() {
let create_buffer = || {
Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::TRANSFER_DST,
BufferCreateInfo {
usage: BufferUsage::TRANSFER_DST,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
(0..image.dimensions().width() * image.dimensions().height() * 4).map(|_| 0u8),

12
examples/src/bin/occlusion-query.rs
View File

@ -13,7 +13,7 @@
use std::sync::Arc;
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
RenderPassBeginInfo, SubpassContents,
@ -25,7 +25,7 @@ use vulkano::{
format::Format,
image::{view::ImageView, AttachmentImage, ImageAccess, ImageUsage, SwapchainImage},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
depth_stencil::DepthStencilState,
@ -207,8 +207,12 @@ fn main() {
];
let vertex_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,

12
examples/src/bin/push-constants.rs
View File

@ -13,7 +13,7 @@
// outperform such memory-backed resource updates.
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage},
buffer::{Buffer, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
},
@ -25,7 +25,7 @@ use vulkano::{
QueueFlags,
},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{ComputePipeline, Pipeline, PipelineBindPoint},
sync::{self, GpuFuture},
VulkanLibrary,
@ -134,8 +134,12 @@ fn main() {
let data_iter = 0..65536u32;
Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::STORAGE_BUFFER,
BufferCreateInfo {
usage: BufferUsage::STORAGE_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
data_iter,

12
examples/src/bin/push-descriptors/main.rs
View File

@ -9,7 +9,7 @@
use std::{io::Cursor, sync::Arc};
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
PrimaryCommandBufferAbstract, RenderPassBeginInfo, SubpassContents,
@ -25,7 +25,7 @@ use vulkano::{
SwapchainImage,
},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
color_blend::ColorBlendState,
@ -176,8 +176,12 @@ fn main() {
];
let vertex_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,

12
examples/src/bin/runtime-shader/main.rs
View File

@ -23,7 +23,7 @@
use std::{fs::File, io::Read, sync::Arc};
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
RenderPassBeginInfo, SubpassContents,
@ -34,7 +34,7 @@ use vulkano::{
},
image::{view::ImageView, ImageAccess, ImageUsage, SwapchainImage},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
input_assembly::InputAssemblyState,
@ -242,8 +242,12 @@ fn main() {
];
let vertex_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,

12
examples/src/bin/runtime_array/main.rs
View File

@ -9,7 +9,7 @@
use std::{io::Cursor, sync::Arc};
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
PrimaryCommandBufferAbstract, RenderPassBeginInfo, SubpassContents,
@ -31,7 +31,7 @@ use vulkano::{
SwapchainImage,
},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
color_blend::ColorBlendState,
@ -243,8 +243,12 @@ fn main() {
];
let vertex_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,

12
examples/src/bin/self-copy-buffer.rs
View File

@ -12,7 +12,7 @@
// second half.
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage},
buffer::{Buffer, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, BufferCopy,
CommandBufferUsage, CopyBufferInfoTyped,
@ -25,7 +25,7 @@ use vulkano::{
QueueFlags,
},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{ComputePipeline, Pipeline, PipelineBindPoint},
sync::{self, GpuFuture},
VulkanLibrary,
@ -126,12 +126,16 @@ fn main() {
let data_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::STORAGE_BUFFER
BufferCreateInfo {
usage: BufferUsage::STORAGE_BUFFER
| BufferUsage::TRANSFER_SRC
| BufferUsage::TRANSFER_DST,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
// We intitialize half of the array and leave the other half at 0, we will use the copy
// command later to fill it.
(0..65536u32).map(|n| if n < 65536 / 2 { n } else { 0 }),

12
examples/src/bin/shader-include/main.rs
View File

@ -12,7 +12,7 @@
// the boilerplate is explained.
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage},
buffer::{Buffer, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
},
@ -24,7 +24,7 @@ use vulkano::{
QueueFlags,
},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{ComputePipeline, Pipeline, PipelineBindPoint},
sync::{self, GpuFuture},
VulkanLibrary,
@ -135,8 +135,12 @@ fn main() {
let data_iter = 0..65536u32;
Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::STORAGE_BUFFER,
BufferCreateInfo {
usage: BufferUsage::STORAGE_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
data_iter,

12
examples/src/bin/shader-types-sharing.rs
View File

@ -27,7 +27,7 @@
use std::sync::Arc;
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage, Subbuffer},
buffer::{Buffer, BufferCreateInfo, BufferUsage, Subbuffer},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
},
@ -39,7 +39,7 @@ use vulkano::{
QueueCreateInfo, QueueFlags,
},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{ComputePipeline, Pipeline, PipelineBindPoint},
sync::{self, GpuFuture},
VulkanLibrary,
@ -238,8 +238,12 @@ fn main() {
// Prepare test array `[0, 1, 2, 3....]`.
let data_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::STORAGE_BUFFER,
BufferCreateInfo {
usage: BufferUsage::STORAGE_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
0..65536u32,

22
examples/src/bin/simple-particles.rs
View File

@ -14,7 +14,7 @@
use std::{sync::Arc, time::SystemTime};
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
CopyBufferInfo, PrimaryCommandBufferAbstract, RenderPassBeginInfo, SubpassContents,
@ -28,7 +28,7 @@ use vulkano::{
},
image::{view::ImageView, ImageUsage},
instance::{Instance, InstanceCreateInfo},
memory::allocator::{MemoryUsage, StandardMemoryAllocator},
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
input_assembly::{InputAssemblyState, PrimitiveTopology},
@ -349,11 +349,14 @@ fn main() {
// Create a CPU-accessible buffer initialized with the vertex data.
let temporary_accessible_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
BufferCreateInfo {
// Specify this buffer will be used as a transfer source.
buffer_usage: BufferUsage::TRANSFER_SRC,
usage: BufferUsage::TRANSFER_SRC,
..Default::default()
},
AllocationCreateInfo {
// Specify this buffer will be used for uploading to the GPU.
memory_usage: MemoryUsage::Upload,
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,
@ -364,13 +367,16 @@ fn main() {
// `Vertex`.
let device_local_buffer = Buffer::new_slice::<Vertex>(
&memory_allocator,
BufferAllocateInfo {
BufferCreateInfo {
// Specify use as a storage buffer, vertex buffer, and transfer destination.
buffer_usage: BufferUsage::STORAGE_BUFFER
usage: BufferUsage::STORAGE_BUFFER
| BufferUsage::TRANSFER_DST
| BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
// Specify this buffer will only be used by the device.
memory_usage: MemoryUsage::DeviceOnly,
usage: MemoryUsage::DeviceOnly,
..Default::default()
},
PARTICLE_COUNT as vulkano::DeviceSize,

12
examples/src/bin/specialization-constants.rs
View File

@ -10,7 +10,7 @@
// TODO: Give a paragraph about what specialization are and what problems they solve.
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage},
buffer::{Buffer, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
},
@ -22,7 +22,7 @@ use vulkano::{
QueueFlags,
},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{ComputePipeline, Pipeline, PipelineBindPoint},
sync::{self, GpuFuture},
VulkanLibrary,
@ -135,8 +135,12 @@ fn main() {
let data_iter = 0..65536u32;
Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::STORAGE_BUFFER,
BufferCreateInfo {
usage: BufferUsage::STORAGE_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
data_iter,

28
examples/src/bin/teapot/main.rs
View File

@ -13,7 +13,7 @@ use std::{sync::Arc, time::Instant};
use vulkano::{
buffer::{
allocator::{SubbufferAllocator, SubbufferAllocatorCreateInfo},
Buffer, BufferAllocateInfo, BufferUsage,
Buffer, BufferCreateInfo, BufferUsage,
},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
@ -29,7 +29,7 @@ use vulkano::{
format::Format,
image::{view::ImageView, AttachmentImage, ImageAccess, ImageUsage, SwapchainImage},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
depth_stencil::DepthStencilState,
@ -162,8 +162,12 @@ fn main() {
let vertex_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
POSITIONS,
@ -171,8 +175,12 @@ fn main() {
.unwrap();
let normals_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
NORMALS,
@ -180,8 +188,12 @@ fn main() {
.unwrap();
let index_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::INDEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::INDEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
INDICES,

12
examples/src/bin/tessellation.rs
View File

@ -23,7 +23,7 @@
use std::sync::Arc;
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
RenderPassBeginInfo, SubpassContents,
@ -34,7 +34,7 @@ use vulkano::{
},
image::{view::ImageView, ImageAccess, ImageUsage, SwapchainImage},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
input_assembly::{InputAssemblyState, PrimitiveTopology},
@ -303,8 +303,12 @@ fn main() {
];
let vertex_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,

12
examples/src/bin/texture_array/main.rs
View File

@ -9,7 +9,7 @@
use std::{io::Cursor, sync::Arc};
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
PrimaryCommandBufferAbstract, RenderPassBeginInfo, SubpassContents,
@ -27,7 +27,7 @@ use vulkano::{
SwapchainImage,
},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
color_blend::ColorBlendState,
@ -182,8 +182,12 @@ fn main() {
];
let vertex_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,

12
examples/src/bin/triangle-v1_3.rs
View File

@ -23,7 +23,7 @@
use std::sync::Arc;
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
RenderingAttachmentInfo, RenderingInfo,
@ -34,7 +34,7 @@ use vulkano::{
},
image::{view::ImageView, ImageAccess, ImageUsage, SwapchainImage},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
input_assembly::InputAssemblyState,
@ -313,8 +313,12 @@ fn main() {
];
let vertex_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,

12
examples/src/bin/triangle.rs
View File

@ -18,7 +18,7 @@
use std::sync::Arc;
use vulkano::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferUsage},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
RenderPassBeginInfo, SubpassContents,
@ -29,7 +29,7 @@ use vulkano::{
},
image::{view::ImageView, ImageAccess, ImageUsage, SwapchainImage},
instance::{Instance, InstanceCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{
graphics::{
input_assembly::InputAssemblyState,
@ -282,8 +282,12 @@ fn main() {
];
let vertex_buffer = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
vertices,

19
vulkano/src/buffer/allocator.rs
View File

@ -9,14 +9,16 @@
//! Efficiently suballocates buffers into smaller subbuffers.
use super::{Buffer, BufferContents, BufferError, BufferMemory, BufferUsage, Subbuffer};
use super::{
sys::BufferCreateInfo, Buffer, BufferContents, BufferError, BufferMemory, BufferUsage,
Subbuffer,
};
use crate::{
buffer::BufferAllocateInfo,
device::{Device, DeviceOwned},
memory::{
allocator::{
align_up, AllocationCreationError, DeviceLayout, MemoryAllocator, MemoryUsage,
StandardMemoryAllocator,
align_up, AllocationCreateInfo, AllocationCreationError, DeviceLayout, MemoryAllocator,
MemoryUsage, StandardMemoryAllocator,
},
DeviceAlignment,
},
@ -353,9 +355,12 @@ where
fn create_arena(&self) -> Result<Arc<Buffer>, AllocationCreationError> {
Buffer::new(
&self.memory_allocator,
BufferAllocateInfo {
buffer_usage: self.buffer_usage,
memory_usage: self.memory_usage,
BufferCreateInfo {
usage: self.buffer_usage,
..Default::default()
},
AllocationCreateInfo {
usage: self.memory_usage,
..Default::default()
},
DeviceLayout::from_size_alignment(self.arena_size, 1).unwrap(),

189
vulkano/src/buffer/mod.rs
View File

@ -95,16 +95,20 @@
//!
//! [`RawBuffer`]: self::sys::RawBuffer
//! [`SubbufferAllocator`]: self::allocator::SubbufferAllocator
//! [`MemoryUsage::DeviceOnly`]: crate::memory::allocator::MemoryUsage::DeviceOnly
//! [`MemoryUsage::Upload`]: crate::memory::allocator::MemoryUsage::Upload
//! [`MemoryUsage::Download`]: crate::memory::allocator::MemoryUsage::Download
//! [the `view` module]: self::view
//! [the `shader` module documentation]: crate::shader
pub use self::{
subbuffer::{BufferContents, BufferContentsLayout, Subbuffer},
sys::BufferCreateInfo,
usage::BufferUsage,
};
use self::{
subbuffer::{ReadLockError, WriteLockError},
sys::{BufferCreateInfo, RawBuffer},
sys::RawBuffer,
};
use crate::{
device::{Device, DeviceOwned},
@ -112,7 +116,7 @@ use crate::{
memory::{
allocator::{
AllocationCreateInfo, AllocationCreationError, AllocationType, DeviceLayout,
MemoryAlloc, MemoryAllocatePreference, MemoryAllocator, MemoryUsage,
MemoryAlloc, MemoryAllocator,
},
is_aligned, DedicatedAllocation, DeviceAlignment, ExternalMemoryHandleType,
ExternalMemoryHandleTypes, ExternalMemoryProperties, MemoryRequirements,
@ -157,12 +161,12 @@ pub mod view;
///
/// ```
/// use vulkano::{
/// buffer::{BufferUsage, Buffer, BufferAllocateInfo},
/// buffer::{BufferUsage, Buffer, BufferCreateInfo},
/// command_buffer::{
/// AutoCommandBufferBuilder, CommandBufferUsage, CopyBufferInfo,
/// PrimaryCommandBufferAbstract,
/// },
/// memory::allocator::MemoryUsage,
/// memory::allocator::{AllocationCreateInfo, MemoryUsage},
/// sync::GpuFuture,
/// DeviceSize,
/// };
@ -177,11 +181,14 @@ pub mod view;
/// // Create a host-accessible buffer initialized with the data.
/// let temporary_accessible_buffer = Buffer::from_iter(
/// &memory_allocator,
/// BufferAllocateInfo {
/// BufferCreateInfo {
/// // Specify that this buffer will be used as a transfer source.
/// buffer_usage: BufferUsage::TRANSFER_SRC,
/// usage: BufferUsage::TRANSFER_SRC,
/// ..Default::default()
/// },
/// AllocationCreateInfo {
/// // Specify use for upload to the device.
/// memory_usage: MemoryUsage::Upload,
/// usage: MemoryUsage::Upload,
/// ..Default::default()
/// },
/// data,
@ -191,11 +198,14 @@ pub mod view;
/// // Create a buffer in device-local with enough space for a slice of `10_000` floats.
/// let device_local_buffer = Buffer::new_slice::<f32>(
/// &memory_allocator,
/// BufferAllocateInfo {
/// BufferCreateInfo {
/// // Specify use as a storage buffer and transfer destination.
/// buffer_usage: BufferUsage::STORAGE_BUFFER | BufferUsage::TRANSFER_DST,
/// usage: BufferUsage::STORAGE_BUFFER | BufferUsage::TRANSFER_DST,
/// ..Default::default()
/// },
/// AllocationCreateInfo {
/// // Specify use by the device only.
/// memory_usage: MemoryUsage::DeviceOnly,
/// usage: MemoryUsage::DeviceOnly,
/// ..Default::default()
/// },
/// 10_000 as DeviceSize,
@ -255,19 +265,23 @@ impl Buffer {
/// buffer allocated in device-local memory, you will need to create a staging buffer and copy
/// the contents over.
///
/// > **Note**: You should **not** set the `buffer_info.size` field. The function does that
/// > itself.
///
/// # Panics
///
/// - Panics if `T` has zero size.
/// - Panics if `T` has an alignment greater than `64`.
pub fn from_data<T>(
allocator: &(impl MemoryAllocator + ?Sized),
allocate_info: BufferAllocateInfo,
buffer_info: BufferCreateInfo,
allocation_info: AllocationCreateInfo,
data: T,
) -> Result<Subbuffer<T>, BufferError>
where
T: BufferContents,
{
let buffer = Buffer::new_sized(allocator, allocate_info)?;
let buffer = Buffer::new_sized(allocator, buffer_info, allocation_info)?;
unsafe { ptr::write(&mut *buffer.write()?, data) };
@ -281,12 +295,16 @@ impl Buffer {
/// buffer allocated in device-local memory, you will need to create a staging buffer and copy
/// the contents over.
///
/// > **Note**: You should **not** set the `buffer_info.size` field. The function does that
/// > itself.
///
/// # Panics
///
/// - Panics if `iter` is empty.
pub fn from_iter<T, I>(
allocator: &(impl MemoryAllocator + ?Sized),
allocate_info: BufferAllocateInfo,
buffer_info: BufferCreateInfo,
allocation_info: AllocationCreateInfo,
iter: I,
) -> Result<Subbuffer<[T]>, BufferError>
where
@ -295,7 +313,12 @@ impl Buffer {
I::IntoIter: ExactSizeIterator,
{
let iter = iter.into_iter();
let buffer = Buffer::new_slice(allocator, allocate_info, iter.len().try_into().unwrap())?;
let buffer = Buffer::new_slice(
allocator,
buffer_info,
allocation_info,
iter.len().try_into().unwrap(),
)?;
for (o, i) in buffer.write()?.iter_mut().zip(iter) {
unsafe { ptr::write(o, i) };
@ -306,15 +329,24 @@ impl Buffer {
/// Creates a new uninitialized `Buffer` for sized data. Returns a [`Subbuffer`] spanning the
/// whole buffer.
///
/// > **Note**: You should **not** set the `buffer_info.size` field. The function does that
/// > itself.
pub fn new_sized<T>(
allocator: &(impl MemoryAllocator + ?Sized),
allocate_info: BufferAllocateInfo,
buffer_info: BufferCreateInfo,
allocation_info: AllocationCreateInfo,
) -> Result<Subbuffer<T>, BufferError>
where
T: BufferContents,
{
let layout = T::LAYOUT.unwrap_sized();
let buffer = Subbuffer::new(Buffer::new(allocator, allocate_info, layout)?);
let buffer = Subbuffer::new(Buffer::new(
allocator,
buffer_info,
allocation_info,
layout,
)?);
Ok(unsafe { buffer.reinterpret_unchecked() })
}
@ -322,29 +354,37 @@ impl Buffer {
/// Creates a new uninitialized `Buffer` for a slice. Returns a [`Subbuffer`] spanning the
/// whole buffer.
///
/// > **Note**: You should **not** set the `buffer_info.size` field. The function does that
/// > itself.
///
/// # Panics
///
/// - Panics if `len` is zero.
pub fn new_slice<T>(
allocator: &(impl MemoryAllocator + ?Sized),
allocate_info: BufferAllocateInfo,
buffer_info: BufferCreateInfo,
allocation_info: AllocationCreateInfo,
len: DeviceSize,
) -> Result<Subbuffer<[T]>, BufferError>
where
T: BufferContents,
{
Buffer::new_unsized(allocator, allocate_info, len)
Buffer::new_unsized(allocator, buffer_info, allocation_info, len)
}
/// Creates a new uninitialized `Buffer` for unsized data. Returns a [`Subbuffer`] spanning the
/// whole buffer.
///
/// > **Note**: You should **not** set the `buffer_info.size` field. The function does that
/// > itself.
///
/// # Panics
///
/// - Panics if `len` is zero.
pub fn new_unsized<T>(
allocator: &(impl MemoryAllocator + ?Sized),
allocate_info: BufferAllocateInfo,
buffer_info: BufferCreateInfo,
allocation_info: AllocationCreateInfo,
len: DeviceSize,
) -> Result<Subbuffer<T>, BufferError>
where
@ -352,48 +392,54 @@ impl Buffer {
{
let len = NonZeroDeviceSize::new(len).expect("empty slices are not valid buffer contents");
let layout = T::LAYOUT.layout_for_len(len).unwrap();
let buffer = Subbuffer::new(Buffer::new(allocator, allocate_info, layout)?);
let buffer = Subbuffer::new(Buffer::new(
allocator,
buffer_info,
allocation_info,
layout,
)?);
Ok(unsafe { buffer.reinterpret_unchecked() })
}
/// Creates a new uninitialized `Buffer` with the given `layout`.
///
/// > **Note**: You should **not** set the `buffer_info.size` field. The function does that
/// > itself.
///
/// # Panics
///
/// - Panics if `layout.alignment()` is greater than 64.
pub fn new(
allocator: &(impl MemoryAllocator + ?Sized),
allocate_info: BufferAllocateInfo,
mut buffer_info: BufferCreateInfo,
allocation_info: AllocationCreateInfo,
layout: DeviceLayout,
) -> Result<Arc<Self>, BufferError> {
assert!(layout.alignment().as_devicesize() <= 64);
// TODO: Enable once sparse binding materializes
// assert!(!allocate_info.flags.contains(BufferCreateFlags::SPARSE_BINDING));
let raw_buffer = RawBuffer::new(
allocator.device().clone(),
BufferCreateInfo {
flags: allocate_info.flags,
sharing: allocate_info.sharing,
size: layout.size(),
usage: allocate_info.buffer_usage,
external_memory_handle_types: allocate_info.external_memory_handle_types,
_ne: crate::NonExhaustive(()),
},
)?;
assert!(
buffer_info.size == 0,
"`Buffer::new*` functions set the `buffer_info.size` field themselves, you should not \
set it yourself",
);
buffer_info.size = layout.size();
let raw_buffer = RawBuffer::new(allocator.device().clone(), buffer_info)?;
let mut requirements = *raw_buffer.memory_requirements();
requirements.layout = requirements.layout.align_to(layout.alignment()).unwrap();
let create_info = AllocationCreateInfo {
requirements,
allocation_type: AllocationType::Linear,
usage: allocate_info.memory_usage,
dedicated_allocation: Some(DedicatedAllocation::Buffer(&raw_buffer)),
allocate_preference: allocate_info.allocate_preference,
_ne: crate::NonExhaustive(()),
};
let mut allocation = unsafe { allocator.allocate_unchecked(create_info) }?;
let mut allocation = unsafe {
allocator.allocate_unchecked(
requirements,
AllocationType::Linear,
allocation_info,
Some(DedicatedAllocation::Buffer(&raw_buffer)),
)
}?;
debug_assert!(is_aligned(
allocation.offset(),
requirements.layout.alignment(),
@ -535,67 +581,6 @@ impl Hash for Buffer {
}
}
/// Parameters to create a new [`RawBuffer`] and allocate and bind memory to it.
#[derive(Clone, Debug)]
pub struct BufferAllocateInfo {
/// Flags to enable.
///
/// The default value is [`BufferCreateFlags::empty()`].
pub flags: BufferCreateFlags,
/// Whether the buffer can be shared across multiple queues, or is limited to a single queue.
///
/// The default value is [`Sharing::Exclusive`].
pub sharing: Sharing<SmallVec<[u32; 4]>>,
/// How the buffer is going to be used.
///
/// The default value is [`BufferUsage::empty()`], which must be overridden.
pub buffer_usage: BufferUsage,
/// The external memory handle types that are going to be used with the buffer.
///
/// If this value is not empty, then the device API version must be at least 1.1, or the
/// [`khr_external_memory`] extension must be enabled on the device.
///
/// The default value is [`ExternalMemoryHandleTypes::empty()`].
///
/// [`khr_external_memory`]: crate::device::DeviceExtensions::khr_external_memory
pub external_memory_handle_types: ExternalMemoryHandleTypes,
/// The memory usage to use for the allocation.
///
/// If this is set to [`MemoryUsage::DeviceOnly`], then the buffer may need to be initialized
/// using a staging buffer. The exception is some integrated GPUs and laptop GPUs, which do not
/// have memory types that are not host-visible. With [`MemoryUsage::Upload`] and
/// [`MemoryUsage::Download`], a staging buffer is never needed.
///
/// The default value is [`MemoryUsage::Upload`].
pub memory_usage: MemoryUsage,
/// The memory allocate preference to use for the allocation.
///
/// The default value is [`MemoryAllocatePreference::Unknown`].
pub allocate_preference: MemoryAllocatePreference,
pub _ne: crate::NonExhaustive,
}
impl Default for BufferAllocateInfo {
#[inline]
fn default() -> Self {
BufferAllocateInfo {
flags: BufferCreateFlags::empty(),
sharing: Sharing::Exclusive,
buffer_usage: BufferUsage::empty(),
external_memory_handle_types: ExternalMemoryHandleTypes::empty(),
memory_usage: MemoryUsage::Upload,
allocate_preference: MemoryAllocatePreference::Unknown,
_ne: crate::NonExhaustive(()),
}
}
}
/// The current state of a buffer.
#[derive(Debug)]
pub(crate) struct BufferState {

32
vulkano/src/buffer/subbuffer.rs
View File

@ -1138,7 +1138,7 @@ mod tests {
use crate::{
buffer::{
sys::{BufferCreateInfo, RawBuffer},
BufferAllocateInfo, BufferUsage,
BufferUsage,
},
memory::{
allocator::{
@ -1218,8 +1218,12 @@ mod tests {
let buffer = Buffer::new_slice::<u32>(
&allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::TRANSFER_SRC,
BufferCreateInfo {
usage: BufferUsage::TRANSFER_SRC,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
6,
@ -1271,24 +1275,24 @@ mod tests {
// Allocate some junk in the same block as the buffer.
let _junk = allocator
.allocate(AllocationCreateInfo {
requirements: MemoryRequirements {
.allocate(
MemoryRequirements {
layout: DeviceLayout::from_size_alignment(17, 1).unwrap(),
..requirements
},
allocation_type: AllocationType::Linear,
usage: MemoryUsage::DeviceOnly,
..Default::default()
})
AllocationType::Linear,
AllocationCreateInfo::default(),
None,
)
.unwrap();
let allocation = allocator
.allocate(AllocationCreateInfo {
.allocate(
requirements,
allocation_type: AllocationType::Linear,
usage: MemoryUsage::DeviceOnly,
..Default::default()
})
AllocationType::Linear,
AllocationCreateInfo::default(),
None,
)
.unwrap();
let buffer = Buffer::from_raw(raw_buffer, BufferMemory::Normal(allocation));

45
vulkano/src/buffer/view.rs
View File

@ -19,18 +19,20 @@
//!
//! ```
//! # use std::sync::Arc;
//! use vulkano::buffer::{Buffer, BufferAllocateInfo, BufferUsage};
//! use vulkano::buffer::{Buffer, BufferCreateInfo, BufferUsage};
//! use vulkano::buffer::view::{BufferView, BufferViewCreateInfo};
//! use vulkano::format::Format;
//! use vulkano::memory::allocator::AllocationCreateInfo;
//!
//! # let queue: Arc<vulkano::device::Queue> = return;
//! # let memory_allocator: vulkano::memory::allocator::StandardMemoryAllocator = return;
//! let buffer = Buffer::new_slice::<u32>(
//! &memory_allocator,
//! BufferAllocateInfo {
//! buffer_usage: BufferUsage::STORAGE_TEXEL_BUFFER,
//! BufferCreateInfo {
//! usage: BufferUsage::STORAGE_TEXEL_BUFFER,
//! ..Default::default()
//! },
//! AllocationCreateInfo::default(),
//! 128,
//! )
//! .unwrap();
@ -428,9 +430,9 @@ impl From<RequirementNotMet> for BufferViewCreationError {
mod tests {
use super::{BufferView, BufferViewCreateInfo, BufferViewCreationError};
use crate::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage},
buffer::{Buffer, BufferCreateInfo, BufferUsage},
format::Format,
memory::allocator::{MemoryUsage, StandardMemoryAllocator},
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
};
#[test]
@ -441,9 +443,12 @@ mod tests {
let buffer = Buffer::new_slice::<[u8; 4]>(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::UNIFORM_TEXEL_BUFFER,
memory_usage: MemoryUsage::DeviceOnly,
BufferCreateInfo {
usage: BufferUsage::UNIFORM_TEXEL_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
128,
@ -467,11 +472,11 @@ mod tests {
let buffer = Buffer::new_slice::<[u8; 4]>(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::STORAGE_TEXEL_BUFFER,
memory_usage: MemoryUsage::DeviceOnly,
BufferCreateInfo {
usage: BufferUsage::STORAGE_TEXEL_BUFFER,
..Default::default()
},
AllocationCreateInfo::default(),
128,
)
.unwrap();
@ -493,11 +498,11 @@ mod tests {
let buffer = Buffer::new_slice::<u32>(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::STORAGE_TEXEL_BUFFER,
memory_usage: MemoryUsage::DeviceOnly,
BufferCreateInfo {
usage: BufferUsage::STORAGE_TEXEL_BUFFER,
..Default::default()
},
AllocationCreateInfo::default(),
128,
)
.unwrap();
@ -519,11 +524,11 @@ mod tests {
let buffer = Buffer::new_slice::<[u8; 4]>(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::TRANSFER_DST, // Dummy value
memory_usage: MemoryUsage::DeviceOnly,
BufferCreateInfo {
usage: BufferUsage::TRANSFER_DST, // Dummy value
..Default::default()
},
AllocationCreateInfo::default(),
128,
)
.unwrap();
@ -547,11 +552,11 @@ mod tests {
let buffer = Buffer::new_slice::<[f64; 4]>(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::UNIFORM_TEXEL_BUFFER | BufferUsage::STORAGE_TEXEL_BUFFER,
memory_usage: MemoryUsage::DeviceOnly,
BufferCreateInfo {
usage: BufferUsage::UNIFORM_TEXEL_BUFFER | BufferUsage::STORAGE_TEXEL_BUFFER,
..Default::default()
},
AllocationCreateInfo::default(),
128,
)
.unwrap();

36
vulkano/src/command_buffer/auto.rs
View File

@ -863,13 +863,13 @@ enum SubmitState {
mod tests {
use super::*;
use crate::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage},
buffer::{Buffer, BufferCreateInfo, BufferUsage},
command_buffer::{
synced::SyncCommandBufferBuilderError, BufferCopy, CopyBufferInfoTyped, CopyError,
ExecuteCommandsError,
},
device::{DeviceCreateInfo, QueueCreateInfo},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
sync::GpuFuture,
};
@ -899,8 +899,12 @@ mod tests {
let source = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::TRANSFER_SRC,
BufferCreateInfo {
usage: BufferUsage::TRANSFER_SRC,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
[1_u32, 2].iter().copied(),
@ -909,8 +913,12 @@ mod tests {
let destination = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::TRANSFER_DST,
BufferCreateInfo {
usage: BufferUsage::TRANSFER_DST,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
[0_u32, 10, 20, 3, 4].iter().copied(),
@ -1032,8 +1040,12 @@ mod tests {
let memory_allocator = StandardMemoryAllocator::new_default(device.clone());
let source = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::TRANSFER_SRC | BufferUsage::TRANSFER_DST,
BufferCreateInfo {
usage: BufferUsage::TRANSFER_SRC | BufferUsage::TRANSFER_DST,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
[0_u32, 1, 2, 3].iter().copied(),
@ -1082,8 +1094,12 @@ mod tests {
let memory_allocator = StandardMemoryAllocator::new_default(device.clone());
let source = Buffer::from_iter(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::TRANSFER_SRC | BufferUsage::TRANSFER_DST,
BufferCreateInfo {
usage: BufferUsage::TRANSFER_SRC | BufferUsage::TRANSFER_DST,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
[0_u32, 1, 2, 3].iter().copied(),

20
vulkano/src/command_buffer/synced/mod.rs
View File

@ -173,7 +173,7 @@ impl Debug for dyn Command {
mod tests {
use super::*;
use crate::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage},
buffer::{Buffer, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::{
CommandBufferAllocator, CommandBufferBuilderAlloc, StandardCommandBufferAllocator,
@ -190,7 +190,7 @@ mod tests {
},
PersistentDescriptorSet, WriteDescriptorSet,
},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{layout::PipelineLayoutCreateInfo, PipelineBindPoint, PipelineLayout},
sampler::{Sampler, SamplerCreateInfo},
shader::ShaderStages,
@ -239,8 +239,12 @@ mod tests {
// Create a tiny test buffer
let buffer = Buffer::from_data(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::TRANSFER_DST,
BufferCreateInfo {
usage: BufferUsage::TRANSFER_DST,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
0u32,
@ -351,8 +355,12 @@ mod tests {
let memory_allocator = StandardMemoryAllocator::new_default(device);
let buf = Buffer::from_data(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::VERTEX_BUFFER,
BufferCreateInfo {
usage: BufferUsage::VERTEX_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
0u32,

29
vulkano/src/image/attachment.rs
View File

@ -416,25 +416,28 @@ impl AttachmentImage {
},
)?;
let requirements = raw_image.memory_requirements()[0];
let create_info = AllocationCreateInfo {
requirements,
allocation_type: AllocationType::NonLinear,
usage: MemoryUsage::DeviceOnly,
allocate_preference: MemoryAllocatePreference::Unknown,
dedicated_allocation: Some(DedicatedAllocation::Image(&raw_image)),
..Default::default()
let res = unsafe {
allocator.allocate_unchecked(
requirements,
AllocationType::NonLinear,
AllocationCreateInfo {
usage: MemoryUsage::DeviceOnly,
allocate_preference: MemoryAllocatePreference::Unknown,
_ne: crate::NonExhaustive(()),
},
Some(DedicatedAllocation::Image(&raw_image)),
)
};
match unsafe { allocator.allocate_unchecked(create_info) } {
match res {
Ok(alloc) => {
debug_assert!(is_aligned(alloc.offset(), requirements.layout.alignment()));
debug_assert!(alloc.size() == requirements.layout.size());
let inner = Arc::new(unsafe {
raw_image
.bind_memory_unchecked([alloc])
.map_err(|(err, _, _)| err)?
});
let inner = Arc::new(
unsafe { raw_image.bind_memory_unchecked([alloc]) }
.map_err(|(err, _, _)| err)?,
);
Ok(Arc::new(AttachmentImage {
inner,

40
vulkano/src/image/immutable.rs
View File

@ -14,7 +14,7 @@ use super::{
ImageLayout, ImageSubresourceLayers, ImageUsage, MipmapsCount,
};
use crate::{
buffer::{Buffer, BufferAllocateInfo, BufferContents, BufferError, BufferUsage, Subbuffer},
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferError, BufferUsage, Subbuffer},
command_buffer::{
allocator::CommandBufferAllocator, AutoCommandBufferBuilder, BlitImageInfo,
BufferImageCopy, CommandBufferBeginError, CopyBufferToImageInfo, ImageBlit,
@ -138,25 +138,28 @@ impl ImmutableImage {
},
)?;
let requirements = raw_image.memory_requirements()[0];
let create_info = AllocationCreateInfo {
requirements,
allocation_type: AllocationType::NonLinear,
usage: MemoryUsage::DeviceOnly,
allocate_preference: MemoryAllocatePreference::Unknown,
dedicated_allocation: Some(DedicatedAllocation::Image(&raw_image)),
..Default::default()
let res = unsafe {
allocator.allocate_unchecked(
requirements,
AllocationType::NonLinear,
AllocationCreateInfo {
usage: MemoryUsage::DeviceOnly,
allocate_preference: MemoryAllocatePreference::Unknown,
_ne: crate::NonExhaustive(()),
},
Some(DedicatedAllocation::Image(&raw_image)),
)
};
match unsafe { allocator.allocate_unchecked(create_info) } {
match res {
Ok(alloc) => {
debug_assert!(is_aligned(alloc.offset(), requirements.layout.alignment()));
debug_assert!(alloc.size() == requirements.layout.size());
let inner = Arc::new(unsafe {
raw_image
.bind_memory_unchecked([alloc])
.map_err(|(err, _, _)| err)?
});
let inner = Arc::new(
unsafe { raw_image.bind_memory_unchecked([alloc]) }
.map_err(|(err, _, _)| err)?,
);
let image = Arc::new(ImmutableImage { inner, layout });
@ -191,9 +194,12 @@ impl ImmutableImage {
{
let source = Buffer::from_iter(
allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::TRANSFER_SRC,
memory_usage: MemoryUsage::Upload,
BufferCreateInfo {
usage: BufferUsage::TRANSFER_SRC,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
iter,

29
vulkano/src/image/storage.rs
View File

@ -125,25 +125,28 @@ impl StorageImage {
},
)?;
let requirements = raw_image.memory_requirements()[0];
let create_info = AllocationCreateInfo {
requirements,
allocation_type: AllocationType::NonLinear,
usage: MemoryUsage::DeviceOnly,
allocate_preference: MemoryAllocatePreference::Unknown,
dedicated_allocation: Some(DedicatedAllocation::Image(&raw_image)),
..Default::default()
let res = unsafe {
allocator.allocate_unchecked(
requirements,
AllocationType::NonLinear,
AllocationCreateInfo {
usage: MemoryUsage::DeviceOnly,
allocate_preference: MemoryAllocatePreference::Unknown,
_ne: crate::NonExhaustive(()),
},
Some(DedicatedAllocation::Image(&raw_image)),
)
};
match unsafe { allocator.allocate_unchecked(create_info) } {
match res {
Ok(alloc) => {
debug_assert!(is_aligned(alloc.offset(), requirements.layout.alignment()));
debug_assert!(alloc.size() == requirements.layout.size());
let inner = Arc::new(unsafe {
raw_image
.bind_memory_unchecked([alloc])
.map_err(|(err, _, _)| err)?
});
let inner = Arc::new(
unsafe { raw_image.bind_memory_unchecked([alloc]) }
.map_err(|(err, _, _)| err)?,
);
Ok(Arc::new(StorageImage {
inner,

195
vulkano/src/memory/allocator/mod.rs
View File

@ -234,7 +234,7 @@ use super::{
};
use crate::{
device::{Device, DeviceOwned},
DeviceSize, NonZeroDeviceSize, RequirementNotMet, RequiresOneOf, Version, VulkanError,
DeviceSize, RequirementNotMet, RequiresOneOf, Version, VulkanError,
};
use ash::vk::{MAX_MEMORY_HEAPS, MAX_MEMORY_TYPES};
use parking_lot::RwLock;
@ -290,9 +290,52 @@ pub unsafe trait MemoryAllocator: DeviceOwned {
) -> Result<MemoryAlloc, AllocationCreationError>;
/// Allocates memory according to requirements.
///
/// # Arguments
///
/// - `requirements` - Requirements of the resource you want to allocate memory for.
///
/// If you plan to bind this memory directly to a non-sparse resource, then this must
/// correspond to the value returned by either [`RawBuffer::memory_requirements`] or
/// [`RawImage::memory_requirements`] for the respective buffer or image.
///
/// [`memory_type_bits`] must be below 2<sup>*n*</sup> where *n* is the number of available
/// memory types.
///
/// The default is a layout with size [`DeviceLayout::MAX_SIZE`] and alignment
/// [`DeviceAlignment::MIN`] and the rest all zeroes, which must be overridden.
///
/// - `allocation_type` - What type of resource this allocation will be used for.
///
/// This should be [`Linear`] for buffers and linear images, and [`NonLinear`] for optimal
/// images. You can not bind memory allocated with the [`Linear`] type to optimal images or
/// bind memory allocated with the [`NonLinear`] type to buffers and linear images. You
/// should never use the [`Unknown`] type unless you have to, as that can be less memory
/// efficient.
///
/// - `dedicated_allocation` - Allows a dedicated allocation to be created.
///
/// You should always fill this field in if you are allocating memory for a non-sparse
/// resource, otherwise the allocator won't be able to create a dedicated allocation if one
/// is recommended.
///
/// This option is silently ignored (treated as `None`) if the device API version is below
/// 1.1 and the [`khr_dedicated_allocation`] extension is not enabled on the device.
///
/// [`alignment`]: MemoryRequirements::alignment
/// [`memory_type_bits`]: MemoryRequirements::memory_type_bits
/// [`RawBuffer::memory_requirements`]: crate::buffer::sys::RawBuffer::memory_requirements
/// [`RawImage::memory_requirements`]: crate::image::sys::RawImage::memory_requirements
/// [`Linear`]: AllocationType::Linear
/// [`NonLinear`]: AllocationType::NonLinear
/// [`Unknown`]: AllocationType::Unknown
/// [`khr_dedicated_allocation`]: crate::device::DeviceExtensions::khr_dedicated_allocation
fn allocate(
&self,
create_info: AllocationCreateInfo<'_>,
requirements: MemoryRequirements,
allocation_type: AllocationType,
create_info: AllocationCreateInfo,
dedicated_allocation: Option<DedicatedAllocation<'_>>,
) -> Result<MemoryAlloc, AllocationCreationError>;
/// Allocates memory according to requirements without checking the parameters.
@ -306,7 +349,10 @@ pub unsafe trait MemoryAllocator: DeviceOwned {
#[cfg_attr(not(feature = "document_unchecked"), doc(hidden))]
unsafe fn allocate_unchecked(
&self,
create_info: AllocationCreateInfo<'_>,
requirements: MemoryRequirements,
allocation_type: AllocationType,
create_info: AllocationCreateInfo,
dedicated_allocation: Option<DedicatedAllocation<'_>>,
) -> Result<MemoryAlloc, AllocationCreationError>;
/// Creates a root allocation/dedicated allocation without checking the parameters.
@ -375,39 +421,7 @@ impl From<MemoryUsage> for MemoryTypeFilter {
/// [allocation]: MemoryAlloc
/// [memory allocator]: MemoryAllocator
#[derive(Clone, Debug)]
pub struct AllocationCreateInfo<'d> {
/// Requirements of the resource you want to allocate memory for.
///
/// If you plan to bind this memory directly to a non-sparse resource, then this must
/// correspond to the value returned by either [`RawBuffer::memory_requirements`] or
/// [`RawImage::memory_requirements`] for the respective buffer or image.
///
/// [`memory_type_bits`] must be below 2<sup>*n*</sup> where *n* is the number of available
/// memory types.
///
/// The default is a layout with size [`DeviceLayout::MAX_SIZE`] and alignment
/// [`DeviceAlignment::MIN`] and the rest all zeroes, which must be overridden.
///
/// [`alignment`]: MemoryRequirements::alignment
/// [`memory_type_bits`]: MemoryRequirements::memory_type_bits
/// [`RawBuffer::memory_requirements`]: crate::buffer::sys::RawBuffer::memory_requirements
/// [`RawImage::memory_requirements`]: crate::image::sys::RawImage::memory_requirements
pub requirements: MemoryRequirements,
/// What type of resource this allocation will be used for.
///
/// This should be [`Linear`] for buffers and linear images, and [`NonLinear`] for optimal
/// images. You can not bind memory allocated with the [`Linear`] type to optimal images or
/// bind memory allocated with the [`NonLinear`] type to buffers and linear images. You should
/// never use the [`Unknown`] type unless you have to, as that can be less memory efficient.
///
/// The default value is [`AllocationType::Unknown`].
///
/// [`Linear`]: AllocationType::Linear
/// [`NonLinear`]: AllocationType::NonLinear
/// [`Unknown`]: AllocationType::Unknown
pub allocation_type: AllocationType,
pub struct AllocationCreateInfo {
/// The intended usage for the allocation.
///
/// The default value is [`MemoryUsage::DeviceOnly`].
@ -418,41 +432,15 @@ pub struct AllocationCreateInfo<'d> {
/// The default value is [`MemoryAllocatePreference::Unknown`].
pub allocate_preference: MemoryAllocatePreference,
/// Allows a dedicated allocation to be created.
///
/// You should always fill this field in if you are allocating memory for a non-sparse
/// resource, otherwise the allocator won't be able to create a dedicated allocation if one is
/// recommended.
///
/// This option is silently ignored (treated as `None`) if the device API version is below 1.1
/// and the [`khr_dedicated_allocation`] extension is not enabled on the device.
///
/// The default value is [`None`].
///
/// [`khr_dedicated_allocation`]: crate::device::DeviceExtensions::khr_dedicated_allocation
pub dedicated_allocation: Option<DedicatedAllocation<'d>>,
pub _ne: crate::NonExhaustive,
}
impl Default for AllocationCreateInfo<'_> {
impl Default for AllocationCreateInfo {
#[inline]
fn default() -> Self {
AllocationCreateInfo {
requirements: MemoryRequirements {
layout: DeviceLayout::new(
NonZeroDeviceSize::new(DeviceLayout::MAX_SIZE).unwrap(),
DeviceAlignment::MIN,
)
.unwrap(),
memory_type_bits: 0,
prefers_dedicated_allocation: false,
requires_dedicated_allocation: false,
},
allocation_type: AllocationType::Unknown,
usage: MemoryUsage::DeviceOnly,
allocate_preference: MemoryAllocatePreference::Unknown,
dedicated_allocation: None,
_ne: crate::NonExhaustive(()),
}
}
@ -894,16 +882,11 @@ impl<S: Suballocator> GenericMemoryAllocator<S> {
);
}
fn validate_allocate(&self, create_info: &AllocationCreateInfo<'_>) {
let &AllocationCreateInfo {
requirements,
allocation_type: _,
usage: _,
allocate_preference: _,
dedicated_allocation,
_ne: _,
} = create_info;
fn validate_allocate(
&self,
requirements: MemoryRequirements,
dedicated_allocation: Option<DedicatedAllocation<'_>>,
) {
assert!(requirements.memory_type_bits != 0);
assert!(requirements.memory_type_bits < 1 << self.pools.len());
@ -1211,33 +1194,47 @@ unsafe impl<S: Suballocator> MemoryAllocator for GenericMemoryAllocator<S> {
/// [`SuballocatorBlockSizeExceeded`]: AllocationCreationError::SuballocatorBlockSizeExceeded
fn allocate(
&self,
create_info: AllocationCreateInfo<'_>,
requirements: MemoryRequirements,
allocation_type: AllocationType,
create_info: AllocationCreateInfo,
dedicated_allocation: Option<DedicatedAllocation<'_>>,
) -> Result<MemoryAlloc, AllocationCreationError> {
self.validate_allocate(&create_info);
self.validate_allocate(requirements, dedicated_allocation);
unsafe { self.allocate_unchecked(create_info) }
unsafe {
self.allocate_unchecked(
requirements,
allocation_type,
create_info,
dedicated_allocation,
)
}
}
unsafe fn allocate_unchecked(
&self,
create_info: AllocationCreateInfo<'_>,
requirements: MemoryRequirements,
allocation_type: AllocationType,
create_info: AllocationCreateInfo,
mut dedicated_allocation: Option<DedicatedAllocation<'_>>,
) -> Result<MemoryAlloc, AllocationCreationError> {
let MemoryRequirements {
layout,
mut memory_type_bits,
mut prefers_dedicated_allocation,
requires_dedicated_allocation,
} = requirements;
let AllocationCreateInfo {
requirements:
MemoryRequirements {
layout,
mut memory_type_bits,
mut prefers_dedicated_allocation,
requires_dedicated_allocation,
},
allocation_type: _,
usage,
allocate_preference,
mut dedicated_allocation,
_ne: _,
} = create_info;
let create_info = SuballocationCreateInfo::from(create_info);
let create_info = SuballocationCreateInfo {
layout,
allocation_type,
_ne: crate::NonExhaustive(()),
};
let size = layout.size();
memory_type_bits &= self.memory_type_bits;
@ -1412,16 +1409,32 @@ unsafe impl<S: Suballocator> MemoryAllocator for Arc<GenericMemoryAllocator<S>>
fn allocate(
&self,
create_info: AllocationCreateInfo<'_>,
requirements: MemoryRequirements,
allocation_type: AllocationType,
create_info: AllocationCreateInfo,
dedicated_allocation: Option<DedicatedAllocation<'_>>,
) -> Result<MemoryAlloc, AllocationCreationError> {
(**self).allocate(create_info)
(**self).allocate(
requirements,
allocation_type,
create_info,
dedicated_allocation,
)
}
unsafe fn allocate_unchecked(
&self,
create_info: AllocationCreateInfo<'_>,
requirements: MemoryRequirements,
allocation_type: AllocationType,
create_info: AllocationCreateInfo,
dedicated_allocation: Option<DedicatedAllocation<'_>>,
) -> Result<MemoryAlloc, AllocationCreationError> {
(**self).allocate_unchecked(create_info)
(**self).allocate_unchecked(
requirements,
allocation_type,
create_info,
dedicated_allocation,
)
}
unsafe fn allocate_dedicated_unchecked(

15
vulkano/src/memory/allocator/suballocator.rs
View File

@ -15,8 +15,8 @@
use self::host::SlotId;
use super::{
align_down, align_up, array_vec::ArrayVec, AllocationCreateInfo, AllocationCreationError,
DeviceAlignment, DeviceLayout,
align_down, align_up, array_vec::ArrayVec, AllocationCreationError, DeviceAlignment,
DeviceLayout,
};
use crate::{
device::{Device, DeviceOwned},
@ -746,17 +746,6 @@ impl Default for SuballocationCreateInfo {
}
}
impl From<AllocationCreateInfo<'_>> for SuballocationCreateInfo {
#[inline]
fn from(create_info: AllocationCreateInfo<'_>) -> Self {
SuballocationCreateInfo {
layout: create_info.requirements.layout,
allocation_type: create_info.allocation_type,
_ne: crate::NonExhaustive(()),
}
}
}
/// Tells the [suballocator] what type of resource will be bound to the allocation, so that it can
/// optimize memory usage while still respecting the [buffer-image granularity].
///

12
vulkano/src/pipeline/compute.rs
View File

@ -397,14 +397,14 @@ impl From<VulkanError> for ComputePipelineCreationError {
#[cfg(test)]
mod tests {
use crate::{
buffer::{Buffer, BufferAllocateInfo, BufferUsage},
buffer::{Buffer, BufferCreateInfo, BufferUsage},
command_buffer::{
allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
},
descriptor_set::{
allocator::StandardDescriptorSetAllocator, PersistentDescriptorSet, WriteDescriptorSet,
},
memory::allocator::StandardMemoryAllocator,
memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
pipeline::{ComputePipeline, Pipeline, PipelineBindPoint},
shader::{ShaderModule, SpecializationConstants, SpecializationMapEntry},
sync::{now, GpuFuture},
@ -490,8 +490,12 @@ mod tests {
let memory_allocator = StandardMemoryAllocator::new_default(device.clone());
let data_buffer = Buffer::from_data(
&memory_allocator,
BufferAllocateInfo {
buffer_usage: BufferUsage::STORAGE_BUFFER,
BufferCreateInfo {
usage: BufferUsage::STORAGE_BUFFER,
..Default::default()
},
AllocationCreateInfo {
usage: MemoryUsage::Upload,
..Default::default()
},
0,