migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-03 07:10:04 -04:00
Code Activity

eframe WGPU:

Browse Source 
* Fix msaa and depth textures for multiples viewports
* Fix panic when the width or height was 0
This commit is contained in:
Konkitoman
2023-10-20 18:40:11 +03:00
parent fb026298fe
commit 84ef02d9f5
2 changed files with 69 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
crates/eframe/src/native/run.rs
View File

@@ -2549,11 +2549,15 @@ mod wgpu_integration {
if let Some(viewport_id) = if let Some(viewport_id) =
running.windows_id.read().get(window_id).copied() running.windows_id.read().get(window_id).copied()
{ {
if 0 < physical_size.width && 0 < physical_size.height { use std::num::NonZeroU32;
if let (Some(width), Some(height)) = (
NonZeroU32::new(physical_size.width),
NonZeroU32::new(physical_size.height),
) {
running.painter.write().on_window_resized( running.painter.write().on_window_resized(
viewport_id, viewport_id,
physical_size.width, width,
physical_size.height, height,
); );
} }
} }
@@ -2562,14 +2566,17 @@ mod wgpu_integration {
new_inner_size, new_inner_size,
.. ..
} => { } => {
if let Some(viewport_id) = use std::num::NonZeroU32;
running.windows_id.read().get(window_id).copied() if let (Some(width), Some(height), Some(viewport_id)) = (
{ NonZeroU32::new(new_inner_size.width),
NonZeroU32::new(new_inner_size.height),
running.windows_id.read().get(window_id).copied(),
) {
repaint_asap = true; repaint_asap = true;
running.painter.write().on_window_resized( running.painter.write().on_window_resized(
viewport_id, viewport_id,
new_inner_size.width, width,
new_inner_size.height, height,
); );
} }
} }

67
crates/egui-wgpu/src/winit.rs
View File

@@ -1,4 +1,4 @@
use std::sync::Arc; use std::{num::NonZeroU32, sync::Arc};
use egui::ViewportId; use egui::ViewportId;
use epaint::ahash::HashMap; use epaint::ahash::HashMap;
@@ -80,8 +80,8 @@ pub struct Painter {
msaa_samples: u32, msaa_samples: u32,
support_transparent_backbuffer: bool, support_transparent_backbuffer: bool,
depth_format: Option<wgpu::TextureFormat>, depth_format: Option<wgpu::TextureFormat>,
depth_texture_view: Option<wgpu::TextureView>, depth_texture_view: HashMap<ViewportId, wgpu::TextureView>,
msaa_texture_view: Option<wgpu::TextureView>, msaa_texture_view: HashMap<ViewportId, wgpu::TextureView>,
screen_capture_state: Option<CaptureState>, screen_capture_state: Option<CaptureState>,
instance: wgpu::Instance, instance: wgpu::Instance,
@@ -121,13 +121,13 @@ impl Painter {
msaa_samples, msaa_samples,
support_transparent_backbuffer, support_transparent_backbuffer,
depth_format, depth_format,
depth_texture_view: None, depth_texture_view: HashMap::default(),
screen_capture_state: None, screen_capture_state: None,
instance, instance,
render_state: None, render_state: None,
surfaces: HashMap::default(), surfaces: HashMap::default(),
msaa_texture_view: None, msaa_texture_view: HashMap::default(),
} }
} }
@@ -243,11 +243,10 @@ impl Painter {
}, },
); );
} }
self.resize_and_generate_depth_texture_view_and_msaa_view(
viewport_id, let Some(width) = NonZeroU32::new(size.width) else { eprintln!("The window width was zero, skip generate textures!"); return Ok(()) };
size.width, let Some(height) = NonZeroU32::new(size.height) else { eprintln!("The window height was zero, skip generate textures!"); return Ok(()) };
size.height, self.resize_and_generate_depth_texture_view_and_msaa_view(viewport_id, width, height);
);
} else { } else {
log::warn!("All surfaces was deleted!"); log::warn!("All surfaces was deleted!");
self.surfaces.clear(); self.surfaces.clear();
@@ -269,26 +268,28 @@ impl Painter {
fn resize_and_generate_depth_texture_view_and_msaa_view( fn resize_and_generate_depth_texture_view_and_msaa_view(
&mut self, &mut self,
viewport_id: ViewportId, viewport_id: ViewportId,
width_in_pixels: u32, width_in_pixels: NonZeroU32,
height_in_pixels: u32, height_in_pixels: NonZeroU32,
) { ) {
crate::profile_function!(); crate::profile_function!();
let render_state = self.render_state.as_ref().unwrap(); let render_state = self.render_state.as_ref().unwrap();
let surface_state = self.surfaces.get_mut(&viewport_id).unwrap(); let surface_state = self.surfaces.get_mut(&viewport_id).unwrap();
surface_state.width = width_in_pixels; surface_state.width = width_in_pixels.get();
surface_state.height = height_in_pixels; surface_state.height = height_in_pixels.get();
Self::configure_surface(surface_state, render_state, self.configuration.present_mode); Self::configure_surface(surface_state, render_state, self.configuration.present_mode);
self.depth_texture_view = self.depth_format.map(|depth_format| { if let Some(depth_format) = self.depth_format {
self.depth_texture_view.insert(
viewport_id,
render_state render_state
.device .device
.create_texture(&wgpu::TextureDescriptor { .create_texture(&wgpu::TextureDescriptor {
label: Some("egui_depth_texture"), label: Some("egui_depth_texture"),
size: wgpu::Extent3d { size: wgpu::Extent3d {
width: width_in_pixels, width: width_in_pixels.get(),
height: height_in_pixels, height: height_in_pixels.get(),
depth_or_array_layers: 1, depth_or_array_layers: 1,
}, },
mip_level_count: 1, mip_level_count: 1,
@@ -299,21 +300,24 @@ impl Painter {
| wgpu::TextureUsages::TEXTURE_BINDING, | wgpu::TextureUsages::TEXTURE_BINDING,
view_formats: &[depth_format], view_formats: &[depth_format],
}) })
.create_view(&wgpu::TextureViewDescriptor::default()) .create_view(&wgpu::TextureViewDescriptor::default()),
}); );
}
self.msaa_texture_view = (self.msaa_samples > 1) if let Some(render_state) = (self.msaa_samples > 1)
.then_some(self.render_state.as_ref()) .then_some(self.render_state.as_ref())
.flatten() .flatten()
.map(|render_state| { {
let texture_format = render_state.target_format; let texture_format = render_state.target_format;
self.msaa_texture_view.insert(
viewport_id,
render_state render_state
.device .device
.create_texture(&wgpu::TextureDescriptor { .create_texture(&wgpu::TextureDescriptor {
label: Some("egui_msaa_texture"), label: Some("egui_msaa_texture"),
size: wgpu::Extent3d { size: wgpu::Extent3d {
width: width_in_pixels, width: width_in_pixels.get(),
height: height_in_pixels, height: height_in_pixels.get(),
depth_or_array_layers: 1, depth_or_array_layers: 1,
}, },
mip_level_count: 1, mip_level_count: 1,
@@ -323,15 +327,16 @@ impl Painter {
usage: wgpu::TextureUsages::RENDER_ATTACHMENT, usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
view_formats: &[texture_format], view_formats: &[texture_format],
}) })
.create_view(&wgpu::TextureViewDescriptor::default()) .create_view(&wgpu::TextureViewDescriptor::default()),
}); );
};
} }
pub fn on_window_resized( pub fn on_window_resized(
&mut self, &mut self,
viewport_id: ViewportId, viewport_id: ViewportId,
width_in_pixels: u32, width_in_pixels: NonZeroU32,
height_in_pixels: u32, height_in_pixels: NonZeroU32,
) { ) {
crate::profile_function!(); crate::profile_function!();
@@ -545,7 +550,7 @@ impl Painter {
}; };
let (view, resolve_target) = (self.msaa_samples > 1) let (view, resolve_target) = (self.msaa_samples > 1)
.then_some(self.msaa_texture_view.as_ref()) .then_some(self.msaa_texture_view.get(&viewport_id))
.flatten() .flatten()
.map_or((&frame_view, None), |texture_view| { .map_or((&frame_view, None), |texture_view| {
(texture_view, Some(&frame_view)) (texture_view, Some(&frame_view))
@@ -565,7 +570,7 @@ impl Painter {
store: true, store: true,
}, },
})], })],
depth_stencil_attachment: self.depth_texture_view.as_ref().map(|view| { depth_stencil_attachment: self.depth_texture_view.get(&viewport_id).map(|view| {
wgpu::RenderPassDepthStencilAttachment { wgpu::RenderPassDepthStencilAttachment {
view, view,
depth_ops: Some(wgpu::Operations { depth_ops: Some(wgpu::Operations {
@@ -618,6 +623,10 @@ impl Painter {
pub fn clean_surfaces(&mut self, avalibile_viewports: &[ViewportId]) { pub fn clean_surfaces(&mut self, avalibile_viewports: &[ViewportId]) {
self.surfaces self.surfaces
.retain(|id, _| avalibile_viewports.contains(id)); .retain(|id, _| avalibile_viewports.contains(id));
self.depth_texture_view
.retain(|id, _| avalibile_viewports.contains(id));
self.msaa_texture_view
.retain(|id, _| avalibile_viewports.contains(id));
} }
#[allow(clippy::unused_self)] #[allow(clippy::unused_self)]