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

Update wgpu to trunk (#34607)

Browse source 
* Update wgpu

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

* fix warnings

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

* Update expectations

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

* re

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

* re

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

* Allow git source for gfx-rs

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-12-13 19:28:47 +01:00 • committed by GitHub
parent 80c4afa63a
commit d24234ac72
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 96 additions and 581 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/webgpu/swapchain.rs
View file

@ -23,7 +23,7 @@ use webrender_traits::{WebrenderExternalImageApi, WebrenderImageSource};
use wgpu_core::device::HostMap;
use wgpu_core::global::Global;
use wgpu_core::id;
use wgpu_core::resource::{BufferAccessError, BufferMapCallback, BufferMapOperation};
use wgpu_core::resource::{BufferAccessError, BufferMapOperation};
use crate::{wgt, ContextConfiguration, Error, WebGPUMsg};
@ -471,15 +471,15 @@ impl crate::WGPU {
let (encoder_id, error) =
global.device_create_command_encoder(device_id, &comm_desc, Some(encoder_id));
err(error)?;
let buffer_cv = wgt::ImageCopyBuffer {
let buffer_cv = wgt::TexelCopyBufferInfo {
buffer: buffer_id,
layout: wgt::ImageDataLayout {
layout: wgt::TexelCopyBufferLayout {
offset: 0,
bytes_per_row: Some(image_desc.buffer_stride() as u32),
rows_per_image: None,
},
};
let texture_cv = wgt::ImageCopyTexture {
let texture_cv = wgt::TexelCopyTextureInfo {
texture: texture_id,
mip_level: 0,
origin: wgt::Origin3d::ZERO,
@ -511,7 +511,7 @@ impl crate::WGPU {
let webrender_api = Arc::clone(&self.webrender_api);
let webrender_document = self.webrender_document;
let token = self.poller.token();
BufferMapCallback::from_rust(Box::from(move |result| {
Box::new(move |result| {
drop(token);
update_wr_image(
result,
@ -524,7 +524,7 @@ impl crate::WGPU {
image_desc,
presentation_id,
);
}))
})
};
let map_op = BufferMapOperation {
host: HostMap::Read,