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

Fix inconsistent trailing command in renderpass macro calls (#2163)

Browse Source
This commit is contained in:
marc0246 2023-03-25 10:25:25 +01:00 committed by GitHub
parent 779ed1023f
commit 5ab869156d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 144 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/src/bin/buffer-allocator.rs
View File

@ -213,12 +213,12 @@ fn main() {
store: Store,
format: swapchain.image_format(),
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

6
examples/src/bin/clear_attachments.rs
View File

@ -143,12 +143,12 @@ fn main() {
store: Store,
format: swapchain.image_format(),
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

13
examples/src/bin/deferred/frame/system.rs
View File

@ -101,7 +101,8 @@ impl FrameSystem {
// currently being processed by the fragment shader. If you want to read from attachments
// but can't deal with these restrictions, then you should create multiple render passes
// instead.
let render_pass = vulkano::ordered_passes_renderpass!(gfx_queue.device().clone(),
let render_pass = vulkano::ordered_passes_renderpass!(
gfx_queue.device().clone(),
attachments: {
// The image that will contain the final rendering (in this example the swapchain
// image, but it could be another image).
@ -131,22 +132,22 @@ impl FrameSystem {
store: DontCare,
format: Format::D16_UNORM,
samples: 1,
}
},
},
passes: [
// Write to the diffuse, normals and depth attachments.
{
color: [diffuse, normals],
depth_stencil: {depth},
input: []
input: [],
},
// Apply lighting by reading these three attachments and writing to `final_color`.
{
color: [final_color],
depth_stencil: {},
input: [diffuse, normals, depth]
}
]
input: [diffuse, normals, depth],
},
],
)
.unwrap();

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

@ -588,12 +588,12 @@ mod linux {
store: Store,
format: swapchain.image_format(),
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

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

@ -200,12 +200,12 @@ fn main() {
store: Store,
format: swapchain.image_format(),
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

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

@ -191,19 +191,20 @@ fn main() {
let vs = vs::load(device.clone()).unwrap();
let fs = fs::load(device.clone()).unwrap();
let render_pass = vulkano::single_pass_renderpass!(device.clone(),
let render_pass = vulkano::single_pass_renderpass!(
device.clone(),
attachments: {
color: {
load: Clear,
store: Store,
format: swapchain.image_format(),
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

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

@ -197,19 +197,20 @@ fn main() {
let vs = vs::load(device.clone()).unwrap();
let fs = fs::load(device.clone()).unwrap();
let render_pass = vulkano::single_pass_renderpass!(device.clone(),
let render_pass = vulkano::single_pass_renderpass!(
device.clone(),
attachments: {
color: {
load: Clear,
store: Store,
format: swapchain.image_format(),
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

6
examples/src/bin/indirect.rs
View File

@ -282,12 +282,12 @@ fn main() {
store: Store,
format: swapchain.image_format(),
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

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

@ -275,12 +275,12 @@ fn main() {
store: Store,
format: swapchain.image_format(),
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

9
examples/src/bin/interactive_fractal/place_over_frame.rs
View File

@ -40,19 +40,20 @@ impl RenderPassPlaceOverFrame {
descriptor_set_allocator: Arc<StandardDescriptorSetAllocator>,
output_format: Format,
) -> RenderPassPlaceOverFrame {
let render_pass = vulkano::single_pass_renderpass!(gfx_queue.device().clone(),
let render_pass = vulkano::single_pass_renderpass!(
gfx_queue.device().clone(),
attachments: {
color: {
load: Clear,
store: Store,
format: output_format,
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();
let subpass = Subpass::from(render_pass.clone(), 0).unwrap();

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

@ -201,7 +201,7 @@ fn main() {
format: Format::R8G8B8A8_UNORM,
// Same here, this has to match.
samples: 1,
}
},
},
pass: {
// When drawing, we have only one output which is the intermediary image.
@ -213,7 +213,7 @@ fn main() {
// the end of the pass, the `intermediary` attachment will be copied to the attachment
// named `color`.
resolve: [color],
}
},
)
.unwrap();

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

@ -248,12 +248,12 @@ fn main() {
store: Store,
format: swapchain.image_format(),
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

9
examples/src/bin/multi_window_game_of_life/render_pass.rs
View File

@ -36,19 +36,20 @@ impl RenderPassPlaceOverFrame {
gfx_queue: Arc<Queue>,
output_format: Format,
) -> RenderPassPlaceOverFrame {
let render_pass = vulkano::single_pass_renderpass!(gfx_queue.device().clone(),
let render_pass = vulkano::single_pass_renderpass!(
gfx_queue.device().clone(),
attachments: {
color: {
load: Clear,
store: Store,
format: output_format,
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();
let subpass = Subpass::from(render_pass.clone(), 0).unwrap();

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

@ -289,12 +289,12 @@ fn main() {
store: DontCare,
format: Format::D16_UNORM,
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {depth}
}
depth_stencil: {depth},
},
)
.unwrap();

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

@ -187,19 +187,20 @@ fn main() {
let vs = vs::load(device.clone()).unwrap();
let fs = fs::load(device.clone()).unwrap();
let render_pass = vulkano::single_pass_renderpass!(device.clone(),
let render_pass = vulkano::single_pass_renderpass!(
device.clone(),
attachments: {
color: {
load: Clear,
store: Store,
format: swapchain.image_format(),
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

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

@ -167,12 +167,12 @@ fn main() {
store: Store,
format: swapchain.image_format(),
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

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

@ -254,19 +254,20 @@ fn main() {
let vs = vs::load(device.clone()).unwrap();
let fs = fs::load(device.clone()).unwrap();
let render_pass = vulkano::single_pass_renderpass!(device.clone(),
let render_pass = vulkano::single_pass_renderpass!(
device.clone(),
attachments: {
color: {
load: Clear,
store: Store,
format: swapchain.image_format(),
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

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

@ -170,12 +170,12 @@ fn main() {
store: Store,
format: swapchain.image_format(),
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

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

@ -199,7 +199,8 @@ fn main() {
let vs = vs::load(device.clone()).unwrap();
let fs = fs::load(device.clone()).unwrap();
let render_pass = vulkano::single_pass_renderpass!(device.clone(),
let render_pass = vulkano::single_pass_renderpass!(
device.clone(),
attachments: {
color: {
load: Clear,
@ -212,12 +213,12 @@ fn main() {
store: DontCare,
format: Format::D16_UNORM,
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {depth}
}
depth_stencil: {depth},
},
)
.unwrap();

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

@ -324,12 +324,12 @@ fn main() {
store: Store,
format: swapchain.image_format(),
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

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

@ -193,19 +193,20 @@ fn main() {
let vs = vs::load(device.clone()).unwrap();
let fs = fs::load(device.clone()).unwrap();
let render_pass = vulkano::single_pass_renderpass!(device.clone(),
let render_pass = vulkano::single_pass_renderpass!(
device.clone(),
attachments: {
color: {
load: Clear,
store: Store,
format: swapchain.image_format(),
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

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

@ -365,14 +365,14 @@ fn main() {
// (multisampling) for antialiasing. An example of this can be found in
// msaa-renderpass.rs.
samples: 1,
}
},
},
pass: {
// We use the attachment named `color` as the one and only color attachment.
color: [color],
// No depth-stencil attachment is indicated with empty brackets.
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

6
vulkano/src/pipeline/graphics/tests.rs
View File

@ -306,12 +306,12 @@ mod simple_rp {
load: Clear,
store: Store,
format: Format,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
}
}

63
vulkano/src/render_pass/framebuffer.rs
View File

@ -719,19 +719,20 @@ mod tests {
fn simple_create() {
let (device, _) = gfx_dev_and_queue!();
let render_pass = single_pass_renderpass!(device.clone(),
let render_pass = single_pass_renderpass!(
device.clone(),
attachments: {
color: {
load: Clear,
store: DontCare,
format: Format::R8G8B8A8_UNORM,
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();
@ -787,19 +788,20 @@ mod tests {
fn attachment_format_mismatch() {
let (device, _) = gfx_dev_and_queue!();
let render_pass = single_pass_renderpass!(device.clone(),
let render_pass = single_pass_renderpass!(
device.clone(),
attachments: {
color: {
load: Clear,
store: DontCare,
format: Format::R8G8B8A8_UNORM,
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();
@ -827,19 +829,20 @@ mod tests {
fn attachment_dims_larger_than_specified_valid() {
let (device, _) = gfx_dev_and_queue!();
let render_pass = single_pass_renderpass!(device.clone(),
let render_pass = single_pass_renderpass!(
device.clone(),
attachments: {
color: {
load: Clear,
store: DontCare,
format: Format::R8G8B8A8_UNORM,
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();
@ -865,19 +868,20 @@ mod tests {
fn attachment_dims_smaller_than_specified() {
let (device, _) = gfx_dev_and_queue!();
let render_pass = single_pass_renderpass!(device.clone(),
let render_pass = single_pass_renderpass!(
device.clone(),
attachments: {
color: {
load: Clear,
store: DontCare,
format: Format::R8G8B8A8_UNORM,
samples: 1,
}
},
},
pass: {
color: [color],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();
@ -905,7 +909,8 @@ mod tests {
fn multi_attachments_auto_smaller() {
let (device, _) = gfx_dev_and_queue!();
let render_pass = single_pass_renderpass!(device.clone(),
let render_pass = single_pass_renderpass!(
device.clone(),
attachments: {
a: {
load: Clear,
@ -918,12 +923,12 @@ mod tests {
store: DontCare,
format: Format::R8G8B8A8_UNORM,
samples: 1,
}
},
},
pass: {
color: [a, b],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();
@ -956,7 +961,8 @@ mod tests {
fn not_enough_attachments() {
let (device, _) = gfx_dev_and_queue!();
let render_pass = single_pass_renderpass!(device.clone(),
let render_pass = single_pass_renderpass!(
device.clone(),
attachments: {
a: {
load: Clear,
@ -969,12 +975,12 @@ mod tests {
store: DontCare,
format: Format::R8G8B8A8_UNORM,
samples: 1,
}
},
},
pass: {
color: [a, b],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();
@ -1005,19 +1011,20 @@ mod tests {
fn too_many_attachments() {
let (device, _) = gfx_dev_and_queue!();
let render_pass = single_pass_renderpass!(device.clone(),
let render_pass = single_pass_renderpass!(
device.clone(),
attachments: {
a: {
load: Clear,
store: DontCare,
format: Format::R8G8B8A8_UNORM,
samples: 1,
}
},
},
pass: {
color: [a],
depth_stencil: {}
}
depth_stencil: {},
},
)
.unwrap();

7
vulkano/src/render_pass/macros.rs
View File

@ -233,7 +233,8 @@ mod tests {
#[test]
fn single_pass_resolve() {
let (device, _) = gfx_dev_and_queue!();
let _ = single_pass_renderpass!(device,
let _ = single_pass_renderpass!(
device,
attachments: {
a: {
load: Clear,
@ -246,13 +247,13 @@ mod tests {
store: Store,
format: Format::R8G8B8A8_UNORM,
samples: 1,
}
},
},
pass: {
color: [a],
depth_stencil: {},
resolve: [b],
}
},
)
.unwrap();
}

32
vulkano/src/render_pass/mod.rs
View File

@ -79,7 +79,8 @@ mod framebuffer;
/// # let device: std::sync::Arc<vulkano::device::Device> = return;
/// use vulkano::format::Format;
///
/// let render_pass = single_pass_renderpass!(device.clone(),
/// let render_pass = single_pass_renderpass!(
/// device.clone(),
/// attachments: {
/// // `foo` is a custom name we give to the first and only attachment.
/// foo: {
@ -87,13 +88,14 @@ mod framebuffer;
/// store: Store,
/// format: Format::R8G8B8A8_UNORM,
/// samples: 1,
/// }
/// },
/// },
/// pass: {
/// color: [foo], // Repeat the attachment name here.
/// depth_stencil: {}
/// }
/// ).unwrap();
/// depth_stencil: {},
/// },
/// )
/// .unwrap();
/// # }
/// ```
///
@ -1261,7 +1263,7 @@ mod tests {
return; // test ignored
}
let rp = single_pass_renderpass! {
let rp = single_pass_renderpass!(
device,
attachments: {
a1: { load: Clear, store: DontCare, format: Format::R8G8B8A8_UNORM, samples: 1, },
@ -1273,13 +1275,13 @@ mod tests {
a7: { load: Clear, store: DontCare, format: Format::R8G8B8A8_UNORM, samples: 1, },
a8: { load: Clear, store: DontCare, format: Format::R8G8B8A8_UNORM, samples: 1, },
a9: { load: Clear, store: DontCare, format: Format::R8G8B8A8_UNORM, samples: 1, },
a10: { load: Clear, store: DontCare, format: Format::R8G8B8A8_UNORM, samples: 1, }
a10: { load: Clear, store: DontCare, format: Format::R8G8B8A8_UNORM, samples: 1, },
},
pass: {
color: [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10],
depth_stencil: {}
}
};
depth_stencil: {},
},
);
match rp {
Err(RenderPassCreationError::SubpassMaxColorAttachmentsExceeded { .. }) => (),
@ -1291,16 +1293,16 @@ mod tests {
fn non_zero_granularity() {
let (device, _) = gfx_dev_and_queue!();
let rp = single_pass_renderpass! {
let rp = single_pass_renderpass!(
device,
attachments: {
a: { load: Clear, store: DontCare, format: Format::R8G8B8A8_UNORM, samples: 1, }
a: { load: Clear, store: DontCare, format: Format::R8G8B8A8_UNORM, samples: 1, },
},
pass: {
color: [a],
depth_stencil: {}
}
}
depth_stencil: {},
},
)
.unwrap();
let granularity = rp.granularity();