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

Record validation error in mapAsync()

Browse source
This commit is contained in:
Kunal Mohan 2020-08-02 14:25:18 +05:30
parent cd8d9162e6
commit 8eff1d74de
2 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/script/dom/gpubuffer.rs
View file

@ -26,9 +26,10 @@ use std::ffi::c_void;
use std::ops::Range; use std::ops::Range;
use std::ptr::NonNull; use std::ptr::NonNull;
use std::rc::Rc; use std::rc::Rc;
use std::string::String;
use webgpu::{ use webgpu::{
wgpu::device::HostMap, WebGPU, WebGPUBuffer, WebGPURequest, WebGPUResponse, identity::WebGPUOpResult, wgpu::device::HostMap, WebGPU, WebGPUBuffer, WebGPURequest,
WebGPUResponseResult, WebGPUResponse, WebGPUResponseResult,
}; };
const RANGE_OFFSET_ALIGN_MASK: u64 = 8; const RANGE_OFFSET_ALIGN_MASK: u64 = 8;
@ -204,10 +205,6 @@ impl GPUBufferMethods for GPUBuffer {
comp: InRealm, comp: InRealm,
) -> Rc<Promise> { ) -> Rc<Promise> {
let promise = Promise::new_in_current_realm(&self.global(), comp); let promise = Promise::new_in_current_realm(&self.global(), comp);
if self.state.get() != GPUBufferState::Unmapped {
promise.reject_error(Error::Abort);
return promise;
}
let range_size = if let Some(s) = size { let range_size = if let Some(s) = size {
s s
} else if offset >= self.size { } else if offset >= self.size {
@ -216,10 +213,23 @@ impl GPUBufferMethods for GPUBuffer {
} else { } else {
self.size - offset self.size - offset
}; };
let scope_id = self.device.use_current_scope();
if self.state.get() != GPUBufferState::Unmapped {
self.device.handle_server_msg(
scope_id,
WebGPUOpResult::ValidationError(String::from("Buffer is not Unmapped")),
);
promise.reject_error(Error::Abort);
return promise;
}
let host_map = match mode { let host_map = match mode {
GPUMapModeConstants::READ => HostMap::Read, GPUMapModeConstants::READ => HostMap::Read,
GPUMapModeConstants::WRITE => HostMap::Write, GPUMapModeConstants::WRITE => HostMap::Write,
_ => { _ => {
self.device.handle_server_msg(
scope_id,
WebGPUOpResult::ValidationError(String::from("Invalid MapModeFlags")),
);
promise.reject_error(Error::Abort); promise.reject_error(Error::Abort);
return promise; return promise;
}, },
@ -231,6 +241,8 @@ impl GPUBufferMethods for GPUBuffer {
if let Err(e) = self.channel.0.send(WebGPURequest::BufferMapAsync { if let Err(e) = self.channel.0.send(WebGPURequest::BufferMapAsync {
sender, sender,
buffer_id: self.buffer.0, buffer_id: self.buffer.0,
device_id: self.device.id().0,
scope_id,
host_map, host_map,
map_range: map_range.clone(), map_range: map_range.clone(),
}) { }) {

7
components/webgpu/lib.rs
View file

@ -67,6 +67,8 @@ pub enum WebGPURequest {
BufferMapAsync { BufferMapAsync {
sender: IpcSender<WebGPUResponseResult>, sender: IpcSender<WebGPUResponseResult>,
buffer_id: id::BufferId, buffer_id: id::BufferId,
device_id: id::DeviceId,
scope_id: Option<u64>,
host_map: HostMap, host_map: HostMap,
map_range: std::ops::Range<u64>, map_range: std::ops::Range<u64>,
}, },
@ -407,6 +409,8 @@ impl<'a> WGPU<'a> {
WebGPURequest::BufferMapAsync { WebGPURequest::BufferMapAsync {
sender, sender,
buffer_id, buffer_id,
device_id,
scope_id,
host_map, host_map,
map_range, map_range,
} => { } => {
@ -456,11 +460,12 @@ impl<'a> WGPU<'a> {
}; };
let global = &self.global; let global = &self.global;
let result = gfx_select!(buffer_id => global.buffer_map_async(buffer_id, map_range, operation)); let result = gfx_select!(buffer_id => global.buffer_map_async(buffer_id, map_range, operation));
if let Err(e) = result { if let Err(ref e) = result {
if let Err(w) = sender.send(Err(format!("{:?}", e))) { if let Err(w) = sender.send(Err(format!("{:?}", e))) {
warn!("Failed to send BufferMapAsync Response ({:?})", w); warn!("Failed to send BufferMapAsync Response ({:?})", w);
} }
} }
self.send_result(device_id, scope_id, result);
}, },
WebGPURequest::BufferMapComplete(buffer_id) => { WebGPURequest::BufferMapComplete(buffer_id) => {
self.buffer_maps.remove(&buffer_id); self.buffer_maps.remove(&buffer_id);