Rename existing Info struct constructors to new (#2643)

* Rename existing `Info` struct constructors to `new` * Make `const` where possible * fmt
vulkano-rs · Feb 9, 2025 · 5df2dc5 · 5df2dc5
1 parent d3b3de0
commit 5df2dc5
Show file tree

Hide file tree

Showing 79 changed files with 402 additions and 321 deletions.
diff --git a/examples/async-update/main.rs b/examples/async-update/main.rs
@@ -617,7 +617,7 @@ impl ApplicationHandler for App {
                 )),
                 dynamic_state: [DynamicState::Viewport].into_iter().collect(),
                 subpass: Some(subpass.into()),
-                ..GraphicsPipelineCreateInfo::layout(layout)
+                ..GraphicsPipelineCreateInfo::new(layout)
             },
         )
         .unwrap();

diff --git a/examples/basic-compute-shader/main.rs b/examples/basic-compute-shader/main.rs
@@ -145,7 +145,7 @@ fn main() {
         ComputePipeline::new(
             device.clone(),
             None,
-            ComputePipelineCreateInfo::stage_layout(stage, layout),
+            ComputePipelineCreateInfo::new(stage, layout),
         )
         .unwrap()
     };

diff --git a/examples/bloom/bloom.rs b/examples/bloom/bloom.rs
@@ -39,7 +39,7 @@ impl BloomTask {
             ComputePipeline::new(
                 app.device.clone(),
                 None,
-                ComputePipelineCreateInfo::stage_layout(stage, pipeline_layout.clone()),
+                ComputePipelineCreateInfo::new(stage, pipeline_layout.clone()),
             )
             .unwrap()
         };
@@ -54,7 +54,7 @@ impl BloomTask {
             ComputePipeline::new(
                 app.device.clone(),
                 None,
-                ComputePipelineCreateInfo::stage_layout(stage, pipeline_layout.clone()),
+                ComputePipelineCreateInfo::new(stage, pipeline_layout.clone()),
             )
             .unwrap()
         };

diff --git a/examples/bloom/main.rs b/examples/bloom/main.rs
@@ -244,28 +244,22 @@ impl ApplicationHandler for App {
                                 0,
                                 DescriptorSetLayoutBinding {
                                     stages: ShaderStages::FRAGMENT | ShaderStages::COMPUTE,
-                                    ..DescriptorSetLayoutBinding::descriptor_type(
-                                        DescriptorType::Sampler,
-                                    )
+                                    ..DescriptorSetLayoutBinding::new(DescriptorType::Sampler)
                                 },
                             ),
                             (
                                 1,
                                 DescriptorSetLayoutBinding {
                                     stages: ShaderStages::FRAGMENT | ShaderStages::COMPUTE,
-                                    ..DescriptorSetLayoutBinding::descriptor_type(
-                                        DescriptorType::SampledImage,
-                                    )
+                                    ..DescriptorSetLayoutBinding::new(DescriptorType::SampledImage)
                                 },
                             ),
                             (
                                 2,
                                 DescriptorSetLayoutBinding {
                                     stages: ShaderStages::COMPUTE,
                                     descriptor_count: MAX_BLOOM_MIP_LEVELS,
-                                    ..DescriptorSetLayoutBinding::descriptor_type(
-                                        DescriptorType::StorageImage,
-                                    )
+                                    ..DescriptorSetLayoutBinding::new(DescriptorType::StorageImage)
                                 },
                             ),
                         ]

diff --git a/examples/bloom/scene.rs b/examples/bloom/scene.rs
@@ -116,7 +116,7 @@ impl SceneTask {
                     )),
                     dynamic_state: [DynamicState::Viewport].into_iter().collect(),
                     subpass: Some(subpass.into()),
-                    ..GraphicsPipelineCreateInfo::layout(pipeline_layout.clone())
+                    ..GraphicsPipelineCreateInfo::new(pipeline_layout.clone())
                 },
             )
             .unwrap()

diff --git a/examples/bloom/tonemap.rs b/examples/bloom/tonemap.rs
@@ -61,7 +61,7 @@ impl TonemapTask {
                     )),
                     dynamic_state: [DynamicState::Viewport].into_iter().collect(),
                     subpass: Some(subpass.into()),
-                    ..GraphicsPipelineCreateInfo::layout(pipeline_layout.clone())
+                    ..GraphicsPipelineCreateInfo::new(pipeline_layout.clone())
                 },
             )
             .unwrap()

diff --git a/examples/buffer-allocator/main.rs b/examples/buffer-allocator/main.rs
@@ -297,7 +297,7 @@ impl ApplicationHandler for App {
                     )),
                     dynamic_state: [DynamicState::Viewport].into_iter().collect(),
                     subpass: Some(subpass.into()),
-                    ..GraphicsPipelineCreateInfo::layout(layout)
+                    ..GraphicsPipelineCreateInfo::new(layout)
                 },
             )
             .unwrap()
@@ -459,10 +459,7 @@ impl ApplicationHandler for App {
                     .unwrap()
                     .then_swapchain_present(
                         self.queue.clone(),
-                        SwapchainPresentInfo::swapchain_image_index(
-                            rcx.swapchain.clone(),
-                            image_index,
-                        ),
+                        SwapchainPresentInfo::new(rcx.swapchain.clone(), image_index),
                     )
                     .then_signal_fence_and_flush();
 

diff --git a/examples/clear-attachments/main.rs b/examples/clear-attachments/main.rs
@@ -329,10 +329,7 @@ impl ApplicationHandler for App {
                     .unwrap()
                     .then_swapchain_present(
                         self.queue.clone(),
-                        SwapchainPresentInfo::swapchain_image_index(
-                            rcx.swapchain.clone(),
-                            image_index,
-                        ),
+                        SwapchainPresentInfo::new(rcx.swapchain.clone(), image_index),
                     )
                     .then_signal_fence_and_flush();
 

diff --git a/examples/debug/main.rs b/examples/debug/main.rs
@@ -76,7 +76,7 @@ fn main() {
                 message_type: DebugUtilsMessageType::GENERAL
                     | DebugUtilsMessageType::VALIDATION
                     | DebugUtilsMessageType::PERFORMANCE,
-                ..DebugUtilsMessengerCreateInfo::user_callback(DebugUtilsMessengerCallback::new(
+                ..DebugUtilsMessengerCreateInfo::new(DebugUtilsMessengerCallback::new(
                     |message_severity, message_type, callback_data| {
                         let severity = if message_severity
                             .intersects(DebugUtilsMessageSeverity::ERROR)

diff --git a/examples/deferred/frame/ambient_lighting_system.rs b/examples/deferred/frame/ambient_lighting_system.rs
@@ -125,7 +125,7 @@ impl AmbientLightingSystem {
                     )),
                     dynamic_state: [DynamicState::Viewport].into_iter().collect(),
                     subpass: Some(subpass.clone().into()),
-                    ..GraphicsPipelineCreateInfo::layout(layout)
+                    ..GraphicsPipelineCreateInfo::new(layout)
                 },
             )
             .unwrap()

diff --git a/examples/deferred/frame/directional_lighting_system.rs b/examples/deferred/frame/directional_lighting_system.rs
@@ -126,7 +126,7 @@ impl DirectionalLightingSystem {
                     )),
                     dynamic_state: [DynamicState::Viewport].into_iter().collect(),
                     subpass: Some(subpass.clone().into()),
-                    ..GraphicsPipelineCreateInfo::layout(layout)
+                    ..GraphicsPipelineCreateInfo::new(layout)
                 },
             )
             .unwrap()

diff --git a/examples/deferred/frame/point_lighting_system.rs b/examples/deferred/frame/point_lighting_system.rs
@@ -125,7 +125,7 @@ impl PointLightingSystem {
                     )),
                     dynamic_state: [DynamicState::Viewport].into_iter().collect(),
                     subpass: Some(subpass.clone().into()),
-                    ..GraphicsPipelineCreateInfo::layout(layout)
+                    ..GraphicsPipelineCreateInfo::new(layout)
                 },
             )
             .unwrap()

diff --git a/examples/deferred/main.rs b/examples/deferred/main.rs
@@ -327,10 +327,7 @@ impl ApplicationHandler for App {
                     .unwrap()
                     .then_swapchain_present(
                         self.queue.clone(),
-                        SwapchainPresentInfo::swapchain_image_index(
-                            rcx.swapchain.clone(),
-                            image_index,
-                        ),
+                        SwapchainPresentInfo::new(rcx.swapchain.clone(), image_index),
                     )
                     .then_signal_fence_and_flush();
 

diff --git a/examples/deferred/triangle_draw_system.rs b/examples/deferred/triangle_draw_system.rs
@@ -109,7 +109,7 @@ impl TriangleDrawSystem {
                     )),
                     dynamic_state: [DynamicState::Viewport].into_iter().collect(),
                     subpass: Some(subpass.clone().into()),
-                    ..GraphicsPipelineCreateInfo::layout(layout)
+                    ..GraphicsPipelineCreateInfo::new(layout)
                 },
             )
             .unwrap()

diff --git a/examples/dynamic-buffers/main.rs b/examples/dynamic-buffers/main.rs
@@ -140,7 +140,7 @@ fn main() {
         ComputePipeline::new(
             device.clone(),
             None,
-            ComputePipelineCreateInfo::stage_layout(stage, layout),
+            ComputePipelineCreateInfo::new(stage, layout),
         )
         .unwrap()
     };

diff --git a/examples/dynamic-local-size/main.rs b/examples/dynamic-local-size/main.rs
@@ -196,7 +196,7 @@ fn main() {
         ComputePipeline::new(
             device.clone(),
             None,
-            ComputePipelineCreateInfo::stage_layout(stage, layout),
+            ComputePipelineCreateInfo::new(stage, layout),
         )
         .unwrap()
     };
@@ -271,7 +271,7 @@ fn main() {
     unsafe { builder.dispatch([1024 / local_size_x, 1024 / local_size_y, 1]) }.unwrap();
 
     builder
-        .copy_image_to_buffer(CopyImageToBufferInfo::image_buffer(image, buf.clone()))
+        .copy_image_to_buffer(CopyImageToBufferInfo::new(image, buf.clone()))
         .unwrap();
 
     let command_buffer = builder.build().unwrap();

diff --git a/examples/gl-interop/main.rs b/examples/gl-interop/main.rs
@@ -567,7 +567,7 @@ mod linux {
                         )),
                         dynamic_state: [DynamicState::Viewport].into_iter().collect(),
                         subpass: Some(subpass.into()),
-                        ..GraphicsPipelineCreateInfo::layout(layout)
+                        ..GraphicsPipelineCreateInfo::new(layout)
                     },
                 )
                 .unwrap()
@@ -740,10 +740,7 @@ mod linux {
                         .unwrap()
                         .then_swapchain_present(
                             self.queue.clone(),
-                            SwapchainPresentInfo::swapchain_image_index(
-                                rcx.swapchain.clone(),
-                                image_index,
-                            ),
+                            SwapchainPresentInfo::new(rcx.swapchain.clone(), image_index),
                         )
                         .then_signal_fence_and_flush();
 

diff --git a/examples/image-self-copy-blit/main.rs b/examples/image-self-copy-blit/main.rs
@@ -236,7 +236,7 @@ impl App {
             // Here, we perform image copying and blitting on the same image.
             uploads
                 // Clear the image buffer.
-                .clear_color_image(ClearColorImageInfo::image(image.clone()))
+                .clear_color_image(ClearColorImageInfo::new(image.clone()))
                 .unwrap()
                 // Put our image in the top left corner.
                 .copy_buffer_to_image(CopyBufferToImageInfo {
@@ -246,7 +246,7 @@ impl App {
                         ..Default::default()
                     }]
                     .into(),
-                    ..CopyBufferToImageInfo::buffer_image(upload_buffer, image.clone())
+                    ..CopyBufferToImageInfo::new(upload_buffer, image.clone())
                 })
                 .unwrap()
                 // Copy from the top left corner to the bottom right corner.
@@ -264,7 +264,7 @@ impl App {
                         ..Default::default()
                     }]
                     .into(),
-                    ..CopyImageInfo::images(image.clone(), image.clone())
+                    ..CopyImageInfo::new(image.clone(), image.clone())
                 })
                 .unwrap()
                 // Blit from the bottom right corner to the top right corner (flipped).
@@ -288,7 +288,7 @@ impl App {
                     }]
                     .into(),
                     filter: Filter::Nearest,
-                    ..BlitImageInfo::images(image.clone(), image.clone())
+                    ..BlitImageInfo::new(image.clone(), image.clone())
                 })
                 .unwrap();
 
@@ -427,7 +427,7 @@ impl ApplicationHandler for App {
                     )),
                     dynamic_state: [DynamicState::Viewport].into_iter().collect(),
                     subpass: Some(subpass.into()),
-                    ..GraphicsPipelineCreateInfo::layout(layout)
+                    ..GraphicsPipelineCreateInfo::new(layout)
                 },
             )
             .unwrap()
@@ -568,10 +568,7 @@ impl ApplicationHandler for App {
                     .unwrap()
                     .then_swapchain_present(
                         self.queue.clone(),
-                        SwapchainPresentInfo::swapchain_image_index(
-                            rcx.swapchain.clone(),
-                            image_index,
-                        ),
+                        SwapchainPresentInfo::new(rcx.swapchain.clone(), image_index),
                     )
                     .then_signal_fence_and_flush();
 

diff --git a/examples/image/main.rs b/examples/image/main.rs
@@ -230,10 +230,7 @@ impl App {
             .unwrap();
 
             uploads
-                .copy_buffer_to_image(CopyBufferToImageInfo::buffer_image(
-                    upload_buffer,
-                    image.clone(),
-                ))
+                .copy_buffer_to_image(CopyBufferToImageInfo::new(upload_buffer, image.clone()))
                 .unwrap();
 
             ImageView::new_default(image).unwrap()
@@ -371,7 +368,7 @@ impl ApplicationHandler for App {
                     )),
                     dynamic_state: [DynamicState::Viewport].into_iter().collect(),
                     subpass: Some(subpass.into()),
-                    ..GraphicsPipelineCreateInfo::layout(layout)
+                    ..GraphicsPipelineCreateInfo::new(layout)
                 },
             )
             .unwrap()
@@ -512,10 +509,7 @@ impl ApplicationHandler for App {
                     .unwrap()
                     .then_swapchain_present(
                         self.queue.clone(),
-                        SwapchainPresentInfo::swapchain_image_index(
-                            rcx.swapchain.clone(),
-                            image_index,
-                        ),
+                        SwapchainPresentInfo::new(rcx.swapchain.clone(), image_index),
                     )
                     .then_signal_fence_and_flush();
 

diff --git a/examples/immutable-sampler/main.rs b/examples/immutable-sampler/main.rs
@@ -236,10 +236,7 @@ impl App {
             .unwrap();
 
             uploads
-                .copy_buffer_to_image(CopyBufferToImageInfo::buffer_image(
-                    upload_buffer,
-                    image.clone(),
-                ))
+                .copy_buffer_to_image(CopyBufferToImageInfo::new(upload_buffer, image.clone()))
                 .unwrap();
 
             ImageView::new_default(image).unwrap()
@@ -390,7 +387,7 @@ impl ApplicationHandler for App {
                     )),
                     dynamic_state: [DynamicState::Viewport].into_iter().collect(),
                     subpass: Some(subpass.into()),
-                    ..GraphicsPipelineCreateInfo::layout(layout)
+                    ..GraphicsPipelineCreateInfo::new(layout)
                 },
             )
             .unwrap()
@@ -531,10 +528,7 @@ impl ApplicationHandler for App {
                     .unwrap()
                     .then_swapchain_present(
                         self.queue.clone(),
-                        SwapchainPresentInfo::swapchain_image_index(
-                            rcx.swapchain.clone(),
-                            image_index,
-                        ),
+                        SwapchainPresentInfo::new(rcx.swapchain.clone(), image_index),
                     )
                     .then_signal_fence_and_flush();
 

diff --git a/examples/indirect/main.rs b/examples/indirect/main.rs
@@ -248,7 +248,7 @@ impl App {
             ComputePipeline::new(
                 device.clone(),
                 None,
-                ComputePipelineCreateInfo::stage_layout(stage, layout),
+                ComputePipelineCreateInfo::new(stage, layout),
             )
             .unwrap()
         };
@@ -397,7 +397,7 @@ impl ApplicationHandler for App {
                     )),
                     dynamic_state: [DynamicState::Viewport].into_iter().collect(),
                     subpass: Some(subpass.into()),
-                    ..GraphicsPipelineCreateInfo::layout(layout)
+                    ..GraphicsPipelineCreateInfo::new(layout)
                 },
             )
             .unwrap()
@@ -578,10 +578,7 @@ impl ApplicationHandler for App {
                     .unwrap()
                     .then_swapchain_present(
                         self.queue.clone(),
-                        SwapchainPresentInfo::swapchain_image_index(
-                            rcx.swapchain.clone(),
-                            image_index,
-                        ),
+                        SwapchainPresentInfo::new(rcx.swapchain.clone(), image_index),
                     )
                     .then_signal_fence_and_flush();
 

diff --git a/examples/instancing/main.rs b/examples/instancing/main.rs
@@ -359,7 +359,7 @@ impl ApplicationHandler for App {
                     )),
                     dynamic_state: [DynamicState::Viewport].into_iter().collect(),
                     subpass: Some(subpass.into()),
-                    ..GraphicsPipelineCreateInfo::layout(layout)
+                    ..GraphicsPipelineCreateInfo::new(layout)
                 },
             )
             .unwrap()
@@ -492,10 +492,7 @@ impl ApplicationHandler for App {
                     .unwrap()
                     .then_swapchain_present(
                         self.queue.clone(),
-                        SwapchainPresentInfo::swapchain_image_index(
-                            rcx.swapchain.clone(),
-                            image_index,
-                        ),
+                        SwapchainPresentInfo::new(rcx.swapchain.clone(), image_index),
                     )
                     .then_signal_fence_and_flush();