Skip to content

Commit 22c2028

Browse files
committed
fix CI
1 parent ff57979 commit 22c2028

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

crates/bevy_core_pipeline/src/bloom/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ impl Node for BloomNode {
252252
view_entity,
253253
);
254254
prefilter_pass
255-
.set_camera_viewport(&camera)
255+
.set_camera_viewport(camera)
256256
.set_render_pipeline(downsampling_prefilter_pipeline)
257257
.set_bind_group(
258258
0,
@@ -277,7 +277,7 @@ impl Node for BloomNode {
277277
view_entity,
278278
);
279279
downsampling_pass
280-
.set_camera_viewport(&camera)
280+
.set_camera_viewport(camera)
281281
.set_render_pipeline(downsampling_pipeline)
282282
.set_bind_group(
283283
0,
@@ -302,7 +302,7 @@ impl Node for BloomNode {
302302
view_entity,
303303
);
304304
upsampling_pass
305-
.set_camera_viewport(&camera)
305+
.set_camera_viewport(camera)
306306
.set_render_pipeline(upsampling_pipeline)
307307
.set_bind_group(
308308
0,
@@ -327,7 +327,7 @@ impl Node for BloomNode {
327327
view_entity,
328328
);
329329
upsampling_final_pass
330-
.set_camera_viewport(&camera)
330+
.set_camera_viewport(camera)
331331
.set_render_pipeline(upsampling_final_pipeline)
332332
.set_bind_group(
333333
0,

crates/bevy_core_pipeline/src/core_2d/main_pass_2d_node.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ impl Node for MainPass2dNode {
7979
.begin(render_context);
8080

8181
render_pass
82-
.set_camera_viewport(&camera)
82+
.set_camera_viewport(camera)
8383
.render_phase(transparent_phase, world);
8484
}
8585

crates/bevy_render/src/render_phase/draw_state.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crate::{
22
camera::ExtractedCamera,
3+
prelude::Color,
34
render_phase::{DrawFunctions, PhaseItem, RenderPhase},
45
render_resource::{
56
BindGroup, BindGroupId, Buffer, BufferId, BufferSlice, RenderPipeline, RenderPipelineId,
@@ -13,7 +14,7 @@ use bevy_ecs::prelude::*;
1314
use bevy_utils::{default, tracing::trace};
1415
use std::ops::Range;
1516
use wgpu::{
16-
Color, IndexFormat, LoadOp, Operations, RenderPass, RenderPassDepthStencilAttachment,
17+
IndexFormat, LoadOp, Operations, RenderPass, RenderPassDepthStencilAttachment,
1718
RenderPassDescriptor,
1819
};
1920
use wgpu_hal::{MAX_BIND_GROUPS, MAX_VERTEX_BUFFERS};
@@ -574,7 +575,7 @@ impl<'a> TrackedRenderPass<'a> {
574575
self
575576
}
576577

577-
/// Set the rendering viewport to the [`Viewport`] of the given [`ExtractedCamera`].
578+
/// Set the rendering viewport to the [`Viewport`](crate::camera::Viewport) of the given [`ExtractedCamera`].
578579
///
579580
/// Subsequent draw calls will be projected into that viewport.
580581
pub fn set_camera_viewport(&mut self, camera: &ExtractedCamera) -> &mut Self {
@@ -653,6 +654,7 @@ impl<'a> TrackedRenderPass<'a> {
653654
self
654655
}
655656

657+
/// Executes all render commands of all phase items of the given `render_phase`.
656658
pub fn render_phase<P: PhaseItem>(
657659
&mut self,
658660
render_phase: &RenderPhase<P>,
@@ -675,7 +677,7 @@ pub struct TrackedRenderPassBuilder<'v> {
675677
view_entity: Entity,
676678
view_target: &'v ViewTarget,
677679
view_depth_texture: Option<&'v ViewDepthTexture>,
678-
color_ops: Option<Operations<Color>>,
680+
color_ops: Option<Operations<wgpu::Color>>,
679681
depth_ops: Option<Operations<f32>>,
680682
stencil_ops: Option<Operations<u32>>,
681683
sampled: bool,
@@ -712,7 +714,7 @@ impl<'v> TrackedRenderPassBuilder<'v> {
712714
}
713715

714716
#[inline]
715-
pub fn color_ops(mut self, load: LoadOp<Color>, store: bool) -> Self {
717+
pub fn color_ops(mut self, load: LoadOp<wgpu::Color>, store: bool) -> Self {
716718
self.color_ops = Some(Operations { load, store });
717719
self
718720
}

0 commit comments

Comments
 (0)