Add support for descriptor set copies and other things

examples/src/bin/async-update.rs

@@ -488,6 +488,7 @@ fn main() {
  &descriptor_set_allocator,
  pipeline.layout().set_layouts()[0].clone(),
  [WriteDescriptorSet::buffer(0, buffer.clone())],
+ [],
  )
  .unwrap()
  })
@@ -504,6 +505,7 @@ fn main() {
  ImageView::new_default(texture).unwrap(),
  sampler.clone(),
  )],
+ [],
  )
  .unwrap()
  });

examples/src/bin/basic-compute-shader.rs

@@ -192,6 +192,7 @@ fn main() {
  &descriptor_set_allocator,
  layout.clone(),
  [WriteDescriptorSet::buffer(0, data_buffer.clone())],
+ [],
  )
  .unwrap();
 

examples/src/bin/deferred/frame/ambient_lighting_system.rs

@@ -174,6 +174,7 @@ impl AmbientLightingSystem {
  &self.descriptor_set_allocator,
  layout.clone(),
  [WriteDescriptorSet::image_view(0, color_input)],
+ [],
  )
  .unwrap();
 

examples/src/bin/deferred/frame/directional_lighting_system.rs

@@ -190,6 +190,7 @@ impl DirectionalLightingSystem {
  WriteDescriptorSet::image_view(0, color_input),
  WriteDescriptorSet::image_view(1, normals_input),
  ],
+ [],
  )
  .unwrap();
 

examples/src/bin/deferred/frame/point_lighting_system.rs

@@ -201,6 +201,7 @@ impl PointLightingSystem {
  WriteDescriptorSet::image_view(1, normals_input),
  WriteDescriptorSet::image_view(2, depth_input),
  ],
+ [],
  )
  .unwrap();
 

examples/src/bin/dynamic-buffers.rs

@@ -233,6 +233,7 @@ fn main() {
  ),
  WriteDescriptorSet::buffer(1, output_buffer.clone()),
  ],
+ [],
  )
  .unwrap();
 

examples/src/bin/dynamic-local-size.rs

@@ -232,6 +232,7 @@ fn main() {
  &descriptor_set_allocator,
  layout.clone(),
  [WriteDescriptorSet::image_view(0, view)],
+ [],
  )
  .unwrap();
 

examples/src/bin/gl-interop.rs

@@ -233,6 +233,7 @@ mod linux {
  [WriteDescriptorSet::image_view_sampler(
  0, image_view, sampler,
  )],
+ [],
  )
  .unwrap();
 

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

@@ -386,6 +386,7 @@ fn main() {
  &descriptor_set_allocator,
  layout.clone(),
  [WriteDescriptorSet::image_view_sampler(0, texture, sampler)],
+ [],
  )
  .unwrap();
 

examples/src/bin/image/main.rs

@@ -312,6 +312,7 @@ fn main() {
  &descriptor_set_allocator,
  layout.clone(),
  [WriteDescriptorSet::image_view_sampler(0, texture, sampler)],
+ [],
  )
  .unwrap();
 

examples/src/bin/immutable-sampler/main.rs

@@ -333,6 +333,7 @@ fn main() {
  &descriptor_set_allocator,
  layout.clone(),
  [WriteDescriptorSet::image_view(0, texture)],
+ [],
  )
  .unwrap();
 

examples/src/bin/indirect.rs

@@ -459,6 +459,7 @@ fn main() {
  WriteDescriptorSet::buffer(0, vertices.clone()),
  WriteDescriptorSet::buffer(1, indirect_buffer.clone()),
  ],
+ [],
  )
  .unwrap();
 

examples/src/bin/interactive_fractal/fractal_compute_pipeline.rs

@@ -153,6 +153,7 @@ impl FractalComputePipeline {
  WriteDescriptorSet::image_view(0, image),
  WriteDescriptorSet::buffer(1, self.palette.clone()),
  ],
+ [],
  )
  .unwrap();
  let mut builder = AutoCommandBufferBuilder::primary(

examples/src/bin/interactive_fractal/pixels_draw_pipeline.rs

@@ -197,6 +197,7 @@ impl PixelsDrawPipeline {
  image.clone(),
  sampler,
  )],
+ [],
  )
  .unwrap()
  }

examples/src/bin/multi_window_game_of_life/game_of_life.rs

@@ -184,6 +184,7 @@ impl GameOfLifeComputePipeline {
  WriteDescriptorSet::buffer(1, self.life_in.clone()),
  WriteDescriptorSet::buffer(2, self.life_out.clone()),
  ],
+ [],
  )
  .unwrap();
 

examples/src/bin/multi_window_game_of_life/pixels_draw.rs

@@ -193,6 +193,7 @@ impl PixelsDrawPipeline {
  image.clone(),
  sampler,
  )],
+ [],
  )
  .unwrap()
  }

examples/src/bin/push-constants.rs

@@ -167,6 +167,7 @@ fn main() {
  &descriptor_set_allocator,
  layout.clone(),
  [WriteDescriptorSet::buffer(0, data_buffer.clone())],
+ [],
  )
  .unwrap();
 

examples/src/bin/push-descriptors/main.rs

@@ -14,7 +14,7 @@ use vulkano::{
  allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
  PrimaryCommandBufferAbstract, RenderPassBeginInfo, SubpassContents,
  },
- descriptor_set::WriteDescriptorSet,
+ descriptor_set::{layout::DescriptorSetLayoutCreateFlags, WriteDescriptorSet},
  device::{
  physical::PhysicalDeviceType, Device, DeviceCreateInfo, DeviceExtensions, QueueCreateInfo,
  QueueFlags,
@@ -276,7 +276,7 @@ fn main() {
  let mut layout_create_info =
  PipelineDescriptorSetLayoutCreateInfo::from_stages(&stages);
  let set_layout = &mut layout_create_info.set_layouts[0];
- set_layout.push_descriptor = true;
+ set_layout.flags |= DescriptorSetLayoutCreateFlags::PUSH_DESCRIPTOR;
  set_layout.bindings.get_mut(&0).unwrap().immutable_samplers = vec![sampler];
 
  PipelineLayout::new(

examples/src/bin/runtime_array/main.rs

@@ -15,7 +15,8 @@ use vulkano::{
  PrimaryCommandBufferAbstract, RenderPassBeginInfo, SubpassContents,
  },
  descriptor_set::{
- allocator::StandardDescriptorSetAllocator, PersistentDescriptorSet, WriteDescriptorSet,
+ allocator::StandardDescriptorSetAllocator, layout::DescriptorBindingFlags,
+ PersistentDescriptorSet, WriteDescriptorSet,
  },
  device::{
  physical::PhysicalDeviceType, Device, DeviceCreateInfo, DeviceExtensions, Features,
@@ -374,7 +375,7 @@ fn main() {
  .bindings
  .get_mut(&0)
  .unwrap();
- binding.variable_descriptor_count = true;
+ binding.binding_flags |= DescriptorBindingFlags::VARIABLE_DESCRIPTOR_COUNT;
  binding.descriptor_count = 2;
 
  PipelineLayout::new(
@@ -419,6 +420,7 @@ fn main() {
  (vulkano_texture as _, sampler),
  ],
  )],
+ [],
  )
  .unwrap();
 

examples/src/bin/self-copy-buffer.rs

@@ -160,6 +160,7 @@ fn main() {
  &descriptor_set_allocator,
  layout.clone(),
  [WriteDescriptorSet::buffer(0, data_buffer.clone())],
+ [],
  )
  .unwrap();
 

examples/src/bin/shader-include/main.rs

@@ -167,6 +167,7 @@ fn main() {
  &descriptor_set_allocator,
  layout.clone(),
  [WriteDescriptorSet::buffer(0, data_buffer.clone())],
+ [],
  )
  .unwrap();
 

examples/src/bin/shader-types-sharing.rs

@@ -197,6 +197,7 @@ fn main() {
  descriptor_set_allocator,
  layout.clone(),
  [WriteDescriptorSet::buffer(0, data_buffer)],
+ [],
  )
  .unwrap();
 

examples/src/bin/simple-particles.rs

@@ -453,6 +453,7 @@ fn main() {
  // 0 is the binding of the data in this set. We bind the `Buffer` of vertices here.
  WriteDescriptorSet::buffer(0, vertex_buffer.clone()),
  ],
+ [],
  )
  .unwrap();
 

examples/src/bin/specialization-constants.rs

@@ -167,6 +167,7 @@ fn main() {
  &descriptor_set_allocator,
  layout.clone(),
  [WriteDescriptorSet::buffer(0, data_buffer.clone())],
+ [],
  )
  .unwrap();
 

examples/src/bin/teapot/main.rs

@@ -346,6 +346,7 @@ fn main() {
  &descriptor_set_allocator,
  layout.clone(),
  [WriteDescriptorSet::buffer(0, uniform_buffer_subbuffer)],
+ [],
  )
  .unwrap();
 

examples/src/bin/texture_array/main.rs

@@ -317,6 +317,7 @@ fn main() {
  &descriptor_set_allocator,
  layout.clone(),
  [WriteDescriptorSet::image_view_sampler(0, texture, sampler)],
+ [],
  )
  .unwrap();
 

vulkano/src/command_buffer/auto/mod.rs

@@ -779,6 +779,7 @@ mod tests {
  Sampler::new(device.clone(), SamplerCreateInfo::simple_repeat_linear())
  .unwrap(),
  )],
+ [],
  )
  .unwrap();
 
@@ -848,6 +849,7 @@ mod tests {
  0,
  Sampler::new(device, SamplerCreateInfo::simple_repeat_linear()).unwrap(),
  )],
+ [],
  )
  .unwrap();