mirror of
https://github.com/servo/servo.git
synced 2025-09-27 15:20:09 +01:00
1f0f079203
There are many important changes here: - Generalize the presentation buffer into standalone staging buffers that hold their own state. This allow them to be used by getImage. - Move all clear handling to the ScriptThread and send the configuration on each request present/getimage, thus avoiding any recreate/clearing messages. This means that we prepare staging buffers lazily, on the first request. Try run for this change: https://github.com/sagudev/servo/actions/runs/17341982368 Testing: This is covered by existing WebGPU CTS tests. There are some bad expectations updates, but they are also on main (presumably from last update the rendering work) although I think CTS is actually wrong (see https://github.com/gpuweb/cts/issues/4440). Fixes: #36820 Fixes: #37705 Fixes: #33368 (we now keep reference alive in hashmap) --------- Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
73 lines
2.1 KiB
Rust
73 lines
2.1 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
|
|
use canvas_context::WGPUImageMap;
|
|
pub use canvas_context::{ContextData, WGPUExternalImages};
|
|
use log::warn;
|
|
use webgpu_traits::{WebGPU, WebGPUMsg};
|
|
use wgpu_thread::WGPU;
|
|
pub use {wgpu_core as wgc, wgpu_types as wgt};
|
|
|
|
mod poll_thread;
|
|
mod wgpu_thread;
|
|
|
|
use std::borrow::Cow;
|
|
use std::sync::{Arc, Mutex};
|
|
|
|
use compositing_traits::{CrossProcessCompositorApi, WebrenderExternalImageRegistry};
|
|
use ipc_channel::ipc::{self, IpcReceiver};
|
|
use servo_config::pref;
|
|
|
|
pub mod canvas_context;
|
|
|
|
pub fn start_webgpu_thread(
|
|
compositor_api: CrossProcessCompositorApi,
|
|
external_images: Arc<Mutex<WebrenderExternalImageRegistry>>,
|
|
wgpu_image_map: WGPUImageMap,
|
|
) -> Option<(WebGPU, IpcReceiver<WebGPUMsg>)> {
|
|
if !pref!(dom_webgpu_enabled) {
|
|
return None;
|
|
}
|
|
let (sender, receiver) = match ipc::channel() {
|
|
Ok(sender_and_receiver) => sender_and_receiver,
|
|
Err(e) => {
|
|
warn!(
|
|
"Failed to create sender and receiver for WGPU thread ({})",
|
|
e
|
|
);
|
|
return None;
|
|
},
|
|
};
|
|
let sender_clone = sender.clone();
|
|
|
|
let (script_sender, script_recv) = match ipc::channel() {
|
|
Ok(sender_and_receiver) => sender_and_receiver,
|
|
Err(e) => {
|
|
warn!(
|
|
"Failed to create receiver and sender for WGPU thread ({})",
|
|
e
|
|
);
|
|
return None;
|
|
},
|
|
};
|
|
|
|
if let Err(e) = std::thread::Builder::new()
|
|
.name("WGPU".to_owned())
|
|
.spawn(move || {
|
|
WGPU::new(
|
|
receiver,
|
|
sender_clone,
|
|
script_sender,
|
|
compositor_api,
|
|
external_images,
|
|
wgpu_image_map,
|
|
)
|
|
.run();
|
|
})
|
|
{
|
|
warn!("Failed to spawn WGPU thread ({})", e);
|
|
return None;
|
|
}
|
|
Some((WebGPU(sender), script_recv))
|
|
}
|