mirror of
https://github.com/emilk/egui.git
synced 2026-09-01 06:10:06 -04:00
Update to wgpu 25 (#6744)
Co-authored-by: Andreas Reich <r_andreas2@web.de>
This commit is contained in:
@@ -52,7 +52,12 @@ egui-wgpu = { workspace = true, optional = true }
|
||||
pollster = { workspace = true, optional = true }
|
||||
image = { workspace = true, optional = true }
|
||||
# Enable DX12 because it always comes with a software rasterizer.
|
||||
wgpu = { workspace = true, features = ["metal", "dx12"], optional = true }
|
||||
wgpu = { workspace = true, features = [
|
||||
"metal",
|
||||
"dx12",
|
||||
"vulkan",
|
||||
"gles",
|
||||
], optional = true }
|
||||
|
||||
# snapshot dependencies
|
||||
dify = { workspace = true, optional = true }
|
||||
|
||||
@@ -47,7 +47,9 @@ pub(crate) fn texture_to_image(device: &Device, queue: &Queue, texture: &Texture
|
||||
buffer_slice.map_async(wgpu::MapMode::Read, move |v| drop(sender.send(v)));
|
||||
|
||||
// Poll the device in a blocking manner so that our future resolves.
|
||||
device.poll(wgpu::Maintain::WaitForSubmissionIndex(submission_index));
|
||||
device
|
||||
.poll(wgpu::PollType::WaitForSubmissionIndex(submission_index))
|
||||
.expect("Failed to poll device");
|
||||
|
||||
receiver.recv().unwrap().unwrap();
|
||||
let buffer_slice = output_buffer.slice(..);
|
||||
|
||||
@@ -28,7 +28,7 @@ pub fn default_wgpu_setup() -> egui_wgpu::WgpuSetup {
|
||||
wgpu::Backend::Dx12 => 2,
|
||||
wgpu::Backend::Gl => 4,
|
||||
wgpu::Backend::BrowserWebGpu => 6,
|
||||
wgpu::Backend::Empty => 7,
|
||||
wgpu::Backend::Noop => 7,
|
||||
});
|
||||
|
||||
// Prefer CPU adapters, otherwise if we can't, prefer discrete GPU over integrated GPU.
|
||||
@@ -202,7 +202,10 @@ impl crate::TestRenderer for WgpuTestRenderer {
|
||||
.queue
|
||||
.submit(user_buffers.into_iter().chain(once(encoder.finish())));
|
||||
|
||||
self.render_state.device.poll(wgpu::Maintain::Wait);
|
||||
self.render_state
|
||||
.device
|
||||
.poll(wgpu::PollType::Wait)
|
||||
.map_err(|e| format!("{e}"))?;
|
||||
|
||||
Ok(texture_to_image(
|
||||
&self.render_state.device,
|
||||
|
||||
Reference in New Issue
Block a user