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

webgpu: Implement proper async pipeline creation and GPUPipelineError (#32636)

Browse source 
* Add GPUPipelineError

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

* Proper GetBindGroupLayout

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

* Proper Create*PipelineAsync

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

* Expectations

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

* fixups

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

* more good expectations

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

---------

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
Samson 2024-08-08 13:48:43 +02:00 • committed by GitHub
parent 08eb4faf4d
commit b8cf0cf9af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 465 additions and 790 deletions
Download patch file Download diff file Expand all files Collapse all files

81
components/webgpu/wgpu_thread.rs
View file

@ -29,6 +29,8 @@ use wgc::pipeline::ShaderModuleDescriptor;
use wgc::resource::{BufferMapCallback, BufferMapOperation};
use wgc::{gfx_select, id};
use wgpu_core::command::RenderPassDescriptor;
use wgpu_core::device::DeviceError;
use wgpu_core::pipeline::{CreateComputePipelineError, CreateRenderPipelineError};
use wgpu_core::resource::BufferAccessResult;
use wgpu_types::MemoryHints;
use wgt::InstanceDescriptor;
@ -38,8 +40,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, WebGPU, WebGPUAdapter,
WebGPUDevice, WebGPUMsg, WebGPUQueue, WebGPURequest, WebGPUResponse,
Adapter, ComputePassId, Error, Pipeline, PopError, PresentationData, RenderPassId, WebGPU,
WebGPUAdapter, WebGPUDevice, WebGPUMsg, WebGPUQueue, WebGPURequest, WebGPUResponse,
};
pub const PRESENTATION_BUFFER_COUNT: usize = 10;
@ -378,6 +380,7 @@ impl WGPU {
compute_pipeline_id,
descriptor,
implicit_ids,
async_sender: sender,
} => {
let global = &self.global;
let bgls = implicit_ids
@ -399,7 +402,24 @@ impl WGPU {
implicit
)
);
self.maybe_dispatch_wgpu_error(device_id, error);
if let Some(sender) = sender {
let res = match error {
// if device is lost we must return pipeline and not raise any error
Some(CreateComputePipelineError::Device(
DeviceError::Lost | DeviceError::Invalid(_),
)) |
None => Ok(Pipeline {
id: compute_pipeline_id,
label: descriptor.label.unwrap_or_default().to_string(),
}),
Some(e) => Err(Error::from_error(e)),
};
if let Err(e) = sender.send(WebGPUResponse::ComputePipeline(res)) {
warn!("Failed sending WebGPUResponse::ComputePipeline {e:?}");
}
} else {
self.maybe_dispatch_wgpu_error(device_id, error);
}
},
WebGPURequest::CreateContext(sender) => {
let id = self
@ -426,6 +446,7 @@ impl WGPU {
render_pipeline_id,
descriptor,
implicit_ids,
async_sender: sender,
} => {
let global = &self.global;
let bgls = implicit_ids
@ -440,14 +461,30 @@ impl WGPU {
root_id: *layout,
group_ids: bgls.as_slice(),
});
if let Some(desc) = descriptor {
let (_, error) = gfx_select!(render_pipeline_id =>
global.device_create_render_pipeline(
device_id,
&desc,
Some(render_pipeline_id),
implicit)
);
let (_, error) = gfx_select!(render_pipeline_id =>
global.device_create_render_pipeline(
device_id,
&descriptor,
Some(render_pipeline_id),
implicit)
);
if let Some(sender) = sender {
let res = match error {
// if device is lost we must return pipeline and not raise any error
Some(CreateRenderPipelineError::Device(
DeviceError::Lost | DeviceError::Invalid(_),
)) |
None => Ok(Pipeline {
id: render_pipeline_id,
label: descriptor.label.unwrap_or_default().to_string(),
}),
Some(e) => Err(Error::from_error(e)),
};
if let Err(e) = sender.send(WebGPUResponse::RenderPipeline(res)) {
warn!("Failed sending WebGPUResponse::RenderPipeline {e:?}");
}
} else {
self.maybe_dispatch_wgpu_error(device_id, error);
}
},
@ -1407,6 +1444,28 @@ impl WGPU {
}
}
},
WebGPURequest::ComputeGetBindGroupLayout {
device_id,
pipeline_id,
index,
id,
} => {
let global = &self.global;
let (_, error) = gfx_select!(pipeline_id =>
global.compute_pipeline_get_bind_group_layout(pipeline_id, index, Some(id)));
self.maybe_dispatch_wgpu_error(device_id, error);
},
WebGPURequest::RenderGetBindGroupLayout {
device_id,
pipeline_id,
index,
id,
} => {
let global = &self.global;
let (_, error) = gfx_select!(pipeline_id =>
global.render_pipeline_get_bind_group_layout(pipeline_id, index, Some(id)));
self.maybe_dispatch_wgpu_error(device_id, error);
},
}
}
}