Skip to content

Commit f54be52

Browse files
committed
Fix wgpu warning due to invalid viewport
We know egui already sets the viewport correctly, so let's not do it redundantly!
1 parent 834737a commit f54be52

File tree

3 files changed

+15
-16
lines changed

3 files changed

+15
-16
lines changed

crates/re_renderer/src/view_builder.rs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,11 @@ impl ViewBuilder {
499499
}
500500
}
501501

502+
/// Resolution in pixels as configured on view builder creation.
503+
pub fn resolution_in_pixel(&self) -> [u32; 2] {
504+
self.setup.resolution_in_pixel
505+
}
506+
502507
fn draw_phase<'a>(
503508
&'a self,
504509
renderers: &Renderers,
@@ -787,19 +792,9 @@ impl ViewBuilder {
787792
ctx: &RenderContext,
788793
render_pipelines: &'a GpuRenderPipelinePoolAccessor<'a>,
789794
pass: &mut wgpu::RenderPass<'a>,
790-
screen_position: glam::Vec2,
791795
) {
792796
re_tracing::profile_function!();
793797

794-
pass.set_viewport(
795-
screen_position.x,
796-
screen_position.y,
797-
self.setup.resolution_in_pixel[0] as f32,
798-
self.setup.resolution_in_pixel[1] as f32,
799-
0.0,
800-
1.0,
801-
);
802-
803798
pass.set_bind_group(0, &self.setup.bind_group_0, &[]);
804799
self.draw_phase(
805800
&ctx.read_lock_renderers(),

crates/re_renderer_examples/framework.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,11 +294,18 @@ impl<E: Example + 'static> Application<E> {
294294
);
295295

296296
for draw_result in &draw_results {
297+
composite_pass.set_viewport(
298+
draw_result.target_location.x,
299+
draw_result.target_location.y,
300+
draw_result.view_builder.resolution_in_pixel()[0] as f32,
301+
draw_result.view_builder.resolution_in_pixel()[1] as f32,
302+
0.0,
303+
1.0,
304+
);
297305
draw_result.view_builder.composite(
298306
&self.re_ctx,
299307
&render_pipelines,
300308
&mut composite_pass,
301-
draw_result.target_location,
302309
);
303310
}
304311
};

crates/re_viewer_context/src/gpu_bridge/re_renderer_callback.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl egui_wgpu::CallbackTrait for ReRendererCallback {
7878

7979
fn paint<'a>(
8080
&'a self,
81-
info: egui::PaintCallbackInfo,
81+
_info: egui::PaintCallbackInfo,
8282
render_pass: &mut wgpu::RenderPass<'a>,
8383
paint_callback_resources: &'a egui_wgpu::CallbackResources,
8484
) {
@@ -97,10 +97,7 @@ impl egui_wgpu::CallbackTrait for ReRendererCallback {
9797
return;
9898
};
9999

100-
let screen_position = (info.viewport.min.to_vec2() * info.pixels_per_point).round();
101-
let screen_position = glam::vec2(screen_position.x, screen_position.y);
102-
103100
self.view_builder
104-
.composite(ctx, render_pipelines, render_pass, screen_position);
101+
.composite(ctx, render_pipelines, render_pass);
105102
}
106103
}

0 commit comments

Comments
 (0)