Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

separate Queue&Device Id (#32966)

Browse source 
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
Samson 2024-08-08 09:53:17 +02:00 • committed by GitHub
parent a5df51ea56
commit f989d3776e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 54 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/script/dom/gpuadapter.rs
View file

@ -138,10 +138,14 @@ impl GPUAdapterMethods for GPUAdapter {
}
}
}
let id = self
let device_id = self
.global()
.wgpu_id_hub()
.create_device_id(self.adapter.0.backend());
let queue_id = self
.global()
.wgpu_id_hub()
.create_queue_id(self.adapter.0.backend());
let pipeline_id = self.global().pipeline_id();
if self
.channel
@ -150,7 +154,8 @@ impl GPUAdapterMethods for GPUAdapter {
sender,
adapter_id: self.adapter,
descriptor: desc,
device_id: id,
device_id,
queue_id,
pipeline_id,
})
.is_err()

1
components/script/dom/gpucanvascontext.rs
View file

@ -272,6 +272,7 @@ impl GPUCanvasContextMethods for GPUCanvasContext {
.0
.send(WebGPURequest::CreateSwapChain {
device_id: descriptor.device.id().0,
queue_id: descriptor.device.GetQueue().id().0,
buffer_ids,
external_id: self.context_id.0,
sender,

8
components/script/dom/gpuqueue.rs
View file

@ -61,6 +61,10 @@ impl GPUQueue {
pub fn set_device(&self, device: &GPUDevice) {
*self.device.borrow_mut() = Some(Dom::from_ref(device));
}
pub fn id(&self) -> WebGPUQueue {
self.queue
}
}
impl GPUQueueMethods for GPUQueue {
@ -95,6 +99,7 @@ impl GPUQueueMethods for GPUQueue {
self.channel
.0
.send(WebGPURequest::Submit {
device_id: self.device.borrow().as_ref().unwrap().id().0,
queue_id: self.queue.0,
command_buffers,
})
@ -133,6 +138,7 @@ impl GPUQueueMethods for GPUQueue {
&bytes[data_offset as usize..(data_offset + content_size) as usize],
);
if let Err(e) = self.channel.0.send(WebGPURequest::WriteBuffer {
device_id: self.device.borrow().as_ref().unwrap().id().0,
queue_id: self.queue.0,
buffer_id: buffer.id().0,
buffer_offset,
@ -169,6 +175,7 @@ impl GPUQueueMethods for GPUQueue {
let final_data = IpcSharedMemory::from_bytes(&bytes);
if let Err(e) = self.channel.0.send(WebGPURequest::WriteTexture {
device_id: self.device.borrow().as_ref().unwrap().id().0,
queue_id: self.queue.0,
texture_cv,
data_layout: texture_layout,
@ -197,6 +204,7 @@ impl GPUQueueMethods for GPUQueue {
.send(WebGPURequest::QueueOnSubmittedWorkDone {
sender,
queue_id: self.queue.0,
device_id: self.device.borrow().as_ref().unwrap().id().0,
})
{
warn!("QueueOnSubmittedWorkDone failed with {e}")

17
components/script/dom/identityhub.rs
View file

@ -6,12 +6,13 @@ use smallvec::SmallVec;
use webgpu::identity::{ComputePass, ComputePassId, RenderPass, RenderPassId};
use webgpu::wgc::id::markers::{
Adapter, BindGroup, BindGroupLayout, Buffer, CommandEncoder, ComputePipeline, Device,
PipelineLayout, RenderBundle, RenderPipeline, Sampler, ShaderModule, Texture, TextureView,
PipelineLayout, Queue, RenderBundle, RenderPipeline, Sampler, ShaderModule, Texture,
TextureView,
};
use webgpu::wgc::id::{
AdapterId, BindGroupId, BindGroupLayoutId, BufferId, CommandEncoderId, ComputePipelineId,
DeviceId, PipelineLayoutId, RenderBundleId, RenderPipelineId, SamplerId, ShaderModuleId,
TextureId, TextureViewId,
DeviceId, PipelineLayoutId, QueueId, RenderBundleId, RenderPipelineId, SamplerId,
ShaderModuleId, TextureId, TextureViewId,
};
use webgpu::wgc::identity::IdentityManager;
use webgpu::wgt::Backend;
@ -20,6 +21,7 @@ use webgpu::wgt::Backend;
pub struct IdentityHub {
adapters: IdentityManager<Adapter>,
devices: IdentityManager<Device>,
queues: IdentityManager<Queue>,
buffers: IdentityManager<Buffer>,
bind_groups: IdentityManager<BindGroup>,
bind_group_layouts: IdentityManager<BindGroupLayout>,
@ -41,6 +43,7 @@ impl IdentityHub {
IdentityHub {
adapters: IdentityManager::new(),
devices: IdentityManager::new(),
queues: IdentityManager::new(),
buffers: IdentityManager::new(),
bind_groups: IdentityManager::new(),
bind_group_layouts: IdentityManager::new(),
@ -123,6 +126,14 @@ impl Identities {
self.select(id.backend()).devices.free(id);
}
pub fn create_queue_id(&self, backend: Backend) -> QueueId {
self.select(backend).queues.process(backend)
}
pub fn free_queue_id(&self, id: QueueId) {
self.select(id.backend()).queues.free(id);
}
pub fn create_adapter_ids(&self) -> SmallVec<[AdapterId; 4]> {
let mut ids = SmallVec::new();
for hubs in self.hubs() {

6
components/webgpu/ipc_messages/recv.rs
View file

@ -130,6 +130,7 @@ pub enum WebGPURequest {
},
CreateSwapChain {
device_id: id::DeviceId,
queue_id: id::QueueId,
buffer_ids: ArrayVec<id::BufferId, PRESENTATION_BUFFER_COUNT>,
external_id: u64,
sender: IpcSender<ImageKey>,
@ -191,6 +192,7 @@ pub enum WebGPURequest {
adapter_id: WebGPUAdapter,
descriptor: wgt::DeviceDescriptor<Option<String>>,
device_id: id::DeviceId,
queue_id: id::QueueId,
pipeline_id: PipelineId,
},
// Compute Pass
@ -250,6 +252,7 @@ pub enum WebGPURequest {
command_encoder_id: id::CommandEncoderId,
},
Submit {
device_id: id::DeviceId,
queue_id: id::QueueId,
command_buffers: Vec<id::CommandBufferId>,
},
@ -267,12 +270,14 @@ pub enum WebGPURequest {
size: u64,
},
WriteBuffer {
device_id: id::DeviceId,
queue_id: id::QueueId,
buffer_id: id::BufferId,
buffer_offset: u64,
data: IpcSharedMemory,
},
WriteTexture {
device_id: id::DeviceId,
queue_id: id::QueueId,
texture_cv: ImageCopyTexture,
data_layout: wgt::ImageDataLayout,
@ -282,6 +287,7 @@ pub enum WebGPURequest {
QueueOnSubmittedWorkDone {
sender: IpcSender<WebGPUResponse>,
queue_id: id::QueueId,
device_id: id::DeviceId,
},
PushErrorScope {
device_id: id::DeviceId,

18
components/webgpu/lib.rs
View file

@ -143,21 +143,3 @@ pub struct PresentationData {
image_desc: ImageDescriptor,
image_data: ImageData,
}
pub trait Transmute<U: id::Marker> {
fn transmute(self) -> id::Id<U>;
}
impl Transmute<id::markers::Queue> for id::Id<id::markers::Device> {
fn transmute(self) -> id::Id<id::markers::Queue> {
// if this is removed next one should be removed too.
self.into_queue_id()
}
}
impl Transmute<id::markers::Device> for id::Id<id::markers::Queue> {
fn transmute(self) -> id::Id<id::markers::Device> {
// SAFETY: This is safe because queue_id = device_id in wgpu
unsafe { id::Id::from_raw(self.into_raw()) }
}
}

27
components/webgpu/wgpu_thread.rs
View file

@ -38,8 +38,8 @@ use crate::gpu_error::ErrorScope;
use crate::poll_thread::Poller;
use crate::render_commands::apply_render_command;
use crate::{
Adapter, ComputePassId, Error, PopError, PresentationData, RenderPassId, Transmute, WebGPU,
WebGPUAdapter, WebGPUDevice, WebGPUMsg, WebGPUQueue, WebGPURequest, WebGPUResponse,
Adapter, ComputePassId, Error, PopError, PresentationData, RenderPassId, WebGPU, WebGPUAdapter,
WebGPUDevice, WebGPUMsg, WebGPUQueue, WebGPURequest, WebGPUResponse,
};
pub const PRESENTATION_BUFFER_COUNT: usize = 10;
@ -491,6 +491,7 @@ impl WGPU {
},
WebGPURequest::CreateSwapChain {
device_id,
queue_id,
buffer_ids,
external_id,
sender,
@ -510,7 +511,7 @@ impl WGPU {
external_id,
PresentationData {
device_id,
queue_id: device_id.transmute(),
queue_id,
data: vec![255; (buffer_stride * height as u32) as usize],
size: Size2D::new(width, height),
unassigned_buffer_ids: buffer_ids,
@ -704,6 +705,7 @@ impl WGPU {
adapter_id,
descriptor,
device_id,
queue_id,
pipeline_id,
} => {
let desc = DeviceDescriptor {
@ -718,7 +720,7 @@ impl WGPU {
&desc,
None,
Some(device_id),
Some(device_id.transmute()),
Some(queue_id),
));
let device = WebGPUDevice(device_id);
let queue = WebGPUQueue(queue_id);
@ -991,6 +993,7 @@ impl WGPU {
};
},
WebGPURequest::Submit {
device_id,
queue_id,
command_buffers,
} => {
@ -1008,7 +1011,7 @@ impl WGPU {
gfx_select!(queue_id => global.queue_submit(queue_id, &command_buffers))
.map_err(Error::from_error)
};
self.maybe_dispatch_error(queue_id.transmute(), result.err());
self.maybe_dispatch_error(device_id, result.err());
},
WebGPURequest::SwapChainPresent {
external_id,
@ -1195,6 +1198,7 @@ impl WGPU {
self.maybe_dispatch_wgpu_error(device_id, result.err());
},
WebGPURequest::WriteBuffer {
device_id,
queue_id,
buffer_id,
buffer_offset,
@ -1208,9 +1212,10 @@ impl WGPU {
buffer_offset as wgt::BufferAddress,
&data
));
self.maybe_dispatch_wgpu_error(queue_id.transmute(), result.err());
self.maybe_dispatch_wgpu_error(device_id, result.err());
},
WebGPURequest::WriteTexture {
device_id,
queue_id,
texture_cv,
data_layout,
@ -1228,9 +1233,13 @@ impl WGPU {
&size
));
drop(_guard);
self.maybe_dispatch_wgpu_error(queue_id.transmute(), result.err());
self.maybe_dispatch_wgpu_error(device_id, result.err());
},
WebGPURequest::QueueOnSubmittedWorkDone { sender, queue_id } => {
WebGPURequest::QueueOnSubmittedWorkDone {
sender,
queue_id,
device_id,
} => {
let global = &self.global;
let token = self.poller.token();
let callback = SubmittedWorkDoneClosure::from_rust(Box::from(move || {
@ -1241,7 +1250,7 @@ impl WGPU {
}));
let result = gfx_select!(queue_id => global.queue_on_submitted_work_done(queue_id, callback));
self.poller.wake();
self.maybe_dispatch_wgpu_error(queue_id.transmute(), result.err());
self.maybe_dispatch_wgpu_error(device_id, result.err());
},
WebGPURequest::DropTexture(id) => {
let global = &self.global;