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

Fix failed request for adapter when not available (#31002)

Browse source 
Signed-off-by: Bentaimia Haddadi <haddadi.taym@gmail.com>
This commit is contained in:
Taym Haddadi 2024-01-09 10:12:53 +01:00 • committed by GitHub
parent dd0149d953
commit fddc4a430f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 97 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

26
components/webgpu/lib.rs
View file

@ -75,7 +75,7 @@ pub type WebGPUResponseResult = Result<WebGPUResponse, String>;
#[derive(Debug, Deserialize, Serialize)]
pub enum WebGPURequest {
BufferMapAsync {
sender: IpcSender<WebGPUResponseResult>,
sender: IpcSender<Option<WebGPUResponseResult>>,
buffer_id: id::BufferId,
device_id: id::DeviceId,
host_map: HostMap,
@ -202,12 +202,12 @@ pub enum WebGPURequest {
device_id: id::DeviceId,
},
RequestAdapter {
sender: IpcSender<WebGPUResponseResult>,
sender: IpcSender<Option<WebGPUResponseResult>>,
options: RequestAdapterOptions,
ids: SmallVec<[id::AdapterId; 4]>,
},
RequestDevice {
sender: IpcSender<WebGPUResponseResult>,
sender: IpcSender<Option<WebGPUResponseResult>>,
adapter_id: WebGPUAdapter,
descriptor: wgt::DeviceDescriptor<Option<String>>,
device_id: id::DeviceId,
@ -340,7 +340,7 @@ struct WGPU<'a> {
// Track invalid adapters https://gpuweb.github.io/gpuweb/#invalid
_invalid_adapters: Vec<WebGPUAdapter>,
// Buffers with pending mapping
buffer_maps: HashMap<id::BufferId, Rc<BufferMapInfo<'a, WebGPUResponseResult>>>,
buffer_maps: HashMap<id::BufferId, Rc<BufferMapInfo<'a, Option<WebGPUResponseResult>>>>,
// Presentation Buffers with pending mapping
present_buffer_maps:
HashMap<id::BufferId, Rc<BufferMapInfo<'a, (Option<ErrorScopeId>, WebGPURequest)>>>,
@ -423,7 +423,7 @@ impl<'a> WGPU<'a> {
userdata: *mut u8,
) {
let info = Rc::from_raw(
userdata as *const BufferMapInfo<WebGPUResponseResult>,
userdata as *const BufferMapInfo<Option<WebGPUResponseResult>>,
);
let msg = match status {
BufferMapAsyncStatus::Success => {
@ -442,7 +442,7 @@ impl<'a> WGPU<'a> {
Err(String::from("Failed to map Buffer"))
},
};
if let Err(e) = info.sender.send(msg) {
if let Err(e) = info.sender.send(Some(msg)) {
warn!("Could not send BufferMapAsync Response ({})", e);
}
}
@ -461,7 +461,7 @@ impl<'a> WGPU<'a> {
let global = &self.global;
let result = gfx_select!(buffer_id => global.buffer_map_async(buffer_id, map_range, operation));
if let Err(ref e) = result {
if let Err(w) = sender.send(Err(format!("{:?}", e))) {
if let Err(w) = sender.send(Some(Err(format!("{:?}", e)))) {
warn!("Failed to send BufferMapAsync Response ({:?})", w);
}
}
@ -879,7 +879,7 @@ impl<'a> WGPU<'a> {
) {
Ok(id) => id,
Err(w) => {
if let Err(e) = sender.send(Err(format!("{:?}", w))) {
if let Err(e) = sender.send(Some(Err(format!("{:?}", w)))) {
warn!(
"Failed to send response to WebGPURequest::RequestAdapter ({})",
e
@ -898,13 +898,13 @@ impl<'a> WGPU<'a> {
gfx_select!(adapter_id => global.adapter_limits(adapter_id)).unwrap();
let features =
gfx_select!(adapter_id => global.adapter_features(adapter_id)).unwrap();
if let Err(e) = sender.send(Ok(WebGPUResponse::RequestAdapter {
if let Err(e) = sender.send(Some(Ok(WebGPUResponse::RequestAdapter {
adapter_info: info,
adapter_id: adapter,
features,
limits,
channel: WebGPU(self.sender.clone()),
})) {
}))) {
warn!(
"Failed to send response to WebGPURequest::RequestAdapter ({})",
e
@ -934,7 +934,7 @@ impl<'a> WGPU<'a> {
) {
Ok(id) => id,
Err(e) => {
if let Err(w) = sender.send(Err(format!("{:?}", e))) {
if let Err(w) = sender.send(Some(Err(format!("{:?}", e)))) {
warn!(
"Failed to send response to WebGPURequest::RequestDevice ({})",
w
@ -948,11 +948,11 @@ impl<'a> WGPU<'a> {
// since wgpu-core uses the same id for the device and the queue
let queue = WebGPUQueue(id);
self.devices.insert(device, pipeline_id);
if let Err(e) = sender.send(Ok(WebGPUResponse::RequestDevice {
if let Err(e) = sender.send(Some(Ok(WebGPUResponse::RequestDevice {
device_id: device,
queue_id: queue,
descriptor,
})) {
}))) {
warn!(
"Failed to send response to WebGPURequest::RequestDevice ({})",
e