mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
webgpu: Add a webgpu_traits
crate (#36320)
This breaks the `script_traits` dependency on `webgpu`. In general, the `traits` crates shouldn't depend on Servo non-`traits` crates. This is necessary to move "script to constellation" messages to the `constellation_traits` crate, making it the entire API for talking to the constellation. This will break a circular dependency when that happens. Testing: Successfully building is enough of a test for this one as it is mainly moving types around. Signed-off-by: Martin Robinson <mrobinson@igalia.com> Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
parent
df9efde1c3
commit
0d693114ad
52 changed files with 640 additions and 568 deletions
|
@ -5,95 +5,73 @@
|
|||
use log::warn;
|
||||
use swapchain::WGPUImageMap;
|
||||
pub use swapchain::{ContextData, WGPUExternalImages};
|
||||
use webgpu_traits::{WebGPU, WebGPUMsg};
|
||||
use webrender::RenderApiSender;
|
||||
use wgpu_thread::WGPU;
|
||||
pub use {wgpu_core as wgc, wgpu_types as wgt};
|
||||
|
||||
pub mod identity;
|
||||
mod poll_thread;
|
||||
mod wgpu_thread;
|
||||
|
||||
use std::borrow::Cow;
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
pub use gpu_error::{Error, ErrorFilter, PopError};
|
||||
use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
|
||||
pub use render_commands::RenderCommand;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use ipc_channel::ipc::{self, IpcReceiver};
|
||||
use servo_config::pref;
|
||||
use webrender_api::DocumentId;
|
||||
use webrender_traits::WebrenderExternalImageRegistry;
|
||||
|
||||
mod gpu_error;
|
||||
mod ipc_messages;
|
||||
mod render_commands;
|
||||
pub mod swapchain;
|
||||
pub use identity::*;
|
||||
pub use ipc_messages::recv::*;
|
||||
pub use ipc_messages::to_dom::*;
|
||||
pub use ipc_messages::to_script::*;
|
||||
pub use swapchain::PRESENTATION_BUFFER_COUNT;
|
||||
|
||||
#[derive(Clone, Debug, Deserialize, Serialize)]
|
||||
pub struct WebGPU(pub IpcSender<WebGPURequest>);
|
||||
|
||||
impl WebGPU {
|
||||
pub fn new(
|
||||
webrender_api_sender: RenderApiSender,
|
||||
webrender_document: DocumentId,
|
||||
external_images: Arc<Mutex<WebrenderExternalImageRegistry>>,
|
||||
wgpu_image_map: WGPUImageMap,
|
||||
) -> Option<(Self, 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,
|
||||
webrender_api_sender,
|
||||
webrender_document,
|
||||
external_images,
|
||||
wgpu_image_map,
|
||||
)
|
||||
.run();
|
||||
})
|
||||
{
|
||||
warn!("Failed to spawn WGPU thread ({})", e);
|
||||
return None;
|
||||
}
|
||||
Some((WebGPU(sender), script_recv))
|
||||
pub fn start_webgpu_thread(
|
||||
webrender_api_sender: RenderApiSender,
|
||||
webrender_document: DocumentId,
|
||||
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();
|
||||
|
||||
pub fn exit(&self, sender: IpcSender<()>) -> Result<(), &'static str> {
|
||||
self.0
|
||||
.send(WebGPURequest::Exit(sender))
|
||||
.map_err(|_| "Failed to send Exit message")
|
||||
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,
|
||||
webrender_api_sender,
|
||||
webrender_document,
|
||||
external_images,
|
||||
wgpu_image_map,
|
||||
)
|
||||
.run();
|
||||
})
|
||||
{
|
||||
warn!("Failed to spawn WGPU thread ({})", e);
|
||||
return None;
|
||||
}
|
||||
Some((WebGPU(sender), script_recv))
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue