Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

webgpu: Use compositor_api instead of webrender_api (#37713)

Browse source 
webgpu currently sends updates WebRender directly via WebRender API
(same as webgl that I also plan to reform). 2D canvas uses Compositor
API for that and with this PR so does webgpu. This will be helpful for
#35733, where compositor must know state of image updates.

Testing: WebGPU CTS run:
https://github.com/sagudev/servo/actions/runs/15895299748

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
sagudev 2025-06-26 12:12:29 +02:00 • committed by GitHub
parent 6656a09f8c
commit c8132137cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 38 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/webgpu/wgpu_thread.rs
View file

@ -10,7 +10,9 @@ use std::slice;
use std::sync::{Arc, Mutex};
use base::id::PipelineId;
use compositing_traits::{WebrenderExternalImageRegistry, WebrenderImageHandlerType};
use compositing_traits::{
CrossProcessCompositorApi, WebrenderExternalImageRegistry, WebrenderImageHandlerType,
};
use ipc_channel::ipc::{IpcReceiver, IpcSender, IpcSharedMemory};
use log::{info, warn};
use servo_config::pref;
@ -19,8 +21,7 @@ use webgpu_traits::{
RenderPassId, ShaderCompilationInfo, WebGPU, WebGPUAdapter, WebGPUContextId, WebGPUDevice,
WebGPUMsg, WebGPUQueue, WebGPURequest, apply_render_command,
};
use webrender::{RenderApi, RenderApiSender};
use webrender_api::{DocumentId, ExternalImageId};
use webrender_api::ExternalImageId;
use wgc::command::{ComputePass, ComputePassDescriptor, RenderPass};
use wgc::device::{DeviceDescriptor, ImplicitPipelineIds};
use wgc::id;
@ -103,8 +104,7 @@ pub(crate) struct WGPU {
/// because wgpu does not invalidate command encoder object
/// (this is also reused for invalidation of command buffers)
error_command_encoders: HashMap<id::CommandEncoderId, String>,
pub(crate) webrender_api: Arc<Mutex<RenderApi>>,
pub(crate) webrender_document: DocumentId,
pub(crate) compositor_api: CrossProcessCompositorApi,
pub(crate) external_images: Arc<Mutex<WebrenderExternalImageRegistry>>,
pub(crate) wgpu_image_map: WGPUImageMap,
/// Provides access to poller thread
@ -120,8 +120,7 @@ impl WGPU {
receiver: IpcReceiver<WebGPURequest>,
sender: IpcSender<WebGPURequest>,
script_sender: IpcSender<WebGPUMsg>,
webrender_api_sender: RenderApiSender,
webrender_document: DocumentId,
compositor_api: CrossProcessCompositorApi,
external_images: Arc<Mutex<WebrenderExternalImageRegistry>>,
wgpu_image_map: WGPUImageMap,
) -> Self {
@ -150,8 +149,7 @@ impl WGPU {
global,
devices: Arc::new(Mutex::new(HashMap::new())),
error_command_encoders: HashMap::new(),
webrender_api: Arc::new(Mutex::new(webrender_api_sender.create_api())),
webrender_document,
compositor_api,
external_images,
wgpu_image_map,
compute_passes: HashMap::new(),
@ -504,7 +502,7 @@ impl WGPU {
.lock()
.expect("Lock poisoned?")
.next_id(WebrenderImageHandlerType::WebGPU);
let image_key = self.webrender_api.lock().unwrap().generate_image_key();
let image_key = self.compositor_api.generate_image_key().unwrap();
let context_id = WebGPUContextId(id.0);
if let Err(e) = sender.send((context_id, image_key)) {
warn!("Failed to send ExternalImageId to new context ({})", e);