migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 13:20:05 -04:00
Code Activity

[egui-wgpu] Device configuration is now dependent on adapter (#2951)

Browse Source 
* [egui-wgpu] Device configuration is now dependent on adapter
Additionally, renamed `backends` into `supported_backends` and improved & unified wgpu config defaults.

* improve wgpu backend default

* clippy fix

* formatting

---------

Co-authored-by: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
This commit is contained in:
Andreas Reich
2023-04-25 09:53:13 +02:00
committed by GitHub
parent 92c7053a14
commit 20e291d3f6
4 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/eframe/src/epi/mod.rs
View File

@@ -497,21 +497,7 @@ impl Default for WebOptions {
webgl_context_option: WebGlContextOption::BestFirst,
#[cfg(feature = "wgpu")]
wgpu_options: egui_wgpu::WgpuConfiguration {
// Use WebGPU or WebGL. Note that WebGL needs to be opted in via a wgpu feature.
backends: wgpu::Backends::BROWSER_WEBGPU | wgpu::Backends::GL,
device_descriptor: wgpu::DeviceDescriptor {
label: Some("egui wgpu device"),
features: wgpu::Features::default(),
limits: wgpu::Limits {
// When using a depth buffer, we have to be able to create a texture
// large enough for the entire surface, and we want to support 4k+ displays.
max_texture_dimension_2d: 8192,
..wgpu::Limits::downlevel_webgl2_defaults()
},
},
..Default::default()
},
wgpu_options: egui_wgpu::WgpuConfiguration::default(),
}
}
}

10
crates/eframe/src/web/web_painter_wgpu.rs
View File

@@ -33,7 +33,6 @@ pub(crate) struct WebPainterWgpu {
canvas_id: String,
surface: wgpu::Surface,
surface_configuration: wgpu::SurfaceConfiguration,
limits: wgpu::Limits,
render_state: Option<RenderState>,
on_surface_error: Arc<dyn Fn(wgpu::SurfaceError) -> SurfaceErrorAction>,
depth_format: Option<wgpu::TextureFormat>,
@@ -78,7 +77,7 @@ impl WebPainterWgpu {
log::debug!("Creating wgpu painter");
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
backends: options.wgpu_options.backends,
backends: options.wgpu_options.supported_backends,
dx12_shader_compiler: Default::default(),
});
@@ -111,7 +110,7 @@ impl WebPainterWgpu {
let (device, queue) = adapter
.request_device(
&options.wgpu_options.device_descriptor,
&(*options.wgpu_options.device_descriptor)(&adapter),
None, // Capture doesn't work in the browser environment.
)
.await
@@ -149,7 +148,6 @@ impl WebPainterWgpu {
surface_configuration,
depth_format,
depth_texture_view: None,
limits: options.wgpu_options.device_descriptor.limits.clone(),
on_surface_error: options.wgpu_options.on_surface_error.clone(),
})
}
@@ -161,7 +159,9 @@ impl WebPainter for WebPainterWgpu {
}
fn max_texture_side(&self) -> usize {
self.limits.max_texture_dimension_2d as _
self.render_state.as_ref().map_or(0, |state| {
state.device.limits().max_texture_dimension_2d as _
})
}
fn paint_and_update_textures(