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

update wgpu and some cleanup

Browse source
This commit is contained in:
Kunal Mohan 2020-08-17 13:33:54 +05:30
parent 62c7cb4c79
commit 8c576bb02b
4 changed files with 25 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

67
components/script/dom/gpudevice.rs
View file

@ -18,6 +18,7 @@ use crate::dom::bindings::codegen::Bindings::GPUComputePipelineBinding::GPUCompu
use crate::dom::bindings::codegen::Bindings::GPUDeviceBinding::{
GPUCommandEncoderDescriptor, GPUDeviceMethods,
};
use crate::dom::bindings::codegen::Bindings::GPUObjectBaseBinding::GPUObjectDescriptorBase;
use crate::dom::bindings::codegen::Bindings::GPUPipelineLayoutBinding::GPUPipelineLayoutDescriptor;
use crate::dom::bindings::codegen::Bindings::GPURenderBundleEncoderBinding::GPURenderBundleEncoderDescriptor;
use crate::dom::bindings::codegen::Bindings::GPURenderPipelineBinding::{
@ -322,11 +323,7 @@ impl GPUDeviceMethods for GPUDevice {
fn CreateBuffer(&self, descriptor: &GPUBufferDescriptor) -> DomRoot<GPUBuffer> {
let desc =
wgt::BufferUsage::from_bits(descriptor.usage).map(|usg| wgpu_res::BufferDescriptor {
label: descriptor
.parent
.label
.as_ref()
.map(|s| Cow::Owned(s.to_string())),
label: convert_label(&descriptor.parent),
size: descriptor.size as wgt::BufferAddress,
usage: usg,
mapped_at_creation: descriptor.mappedAtCreation,
@ -482,11 +479,7 @@ impl GPUDeviceMethods for GPUDevice {
let desc = if valid {
Some(wgpu_bind::BindGroupLayoutDescriptor {
label: descriptor
.parent
.label
.as_ref()
.map(|s| Cow::Owned(s.to_string())),
label: convert_label(&descriptor.parent),
entries: Cow::Owned(entries),
})
} else {
@ -529,11 +522,7 @@ impl GPUDeviceMethods for GPUDevice {
descriptor: &GPUPipelineLayoutDescriptor,
) -> DomRoot<GPUPipelineLayout> {
let desc = wgpu_bind::PipelineLayoutDescriptor {
label: descriptor
.parent
.label
.as_ref()
.map(|s| Cow::Owned(s.to_string())),
label: convert_label(&descriptor.parent),
bind_group_layouts: Cow::Owned(
descriptor
.bindGroupLayouts
@ -597,11 +586,7 @@ impl GPUDeviceMethods for GPUDevice {
.collect::<Vec<_>>();
let desc = wgpu_bind::BindGroupDescriptor {
label: descriptor
.parent
.label
.as_ref()
.map(|l| Cow::Owned(l.to_string())),
label: convert_label(&descriptor.parent),
layout: descriptor.layout.id().0,
entries: Cow::Owned(entries),
};
@ -688,12 +673,7 @@ impl GPUDeviceMethods for GPUDevice {
let scope_id = self.use_current_scope();
let desc = wgpu_pipe::ComputePipelineDescriptor {
label: descriptor
.parent
.parent
.label
.as_ref()
.map(|s| Cow::Owned(s.to_string())),
label: convert_label(&descriptor.parent.parent),
layout: Some(descriptor.parent.layout.id().0),
compute_stage: wgpu_pipe::ProgrammableStageDescriptor {
module: descriptor.computeStage.module.id().0,
@ -739,11 +719,7 @@ impl GPUDeviceMethods for GPUDevice {
WebGPURequest::CreateCommandEncoder {
device_id: self.device.0,
command_encoder_id,
label: descriptor
.parent
.label
.as_ref()
.map(|l| Cow::Owned(l.to_string())),
label: convert_label(&descriptor.parent),
},
))
.expect("Failed to create WebGPU command encoder");
@ -765,11 +741,7 @@ impl GPUDeviceMethods for GPUDevice {
let size = convert_texture_size_to_dict(&descriptor.size);
let desc =
wgt::TextureUsage::from_bits(descriptor.usage).map(|usg| wgpu_res::TextureDescriptor {
label: descriptor
.parent
.label
.as_ref()
.map(|l| Cow::Owned(l.to_string())),
label: convert_label(&descriptor.parent),
size: convert_texture_size_to_wgt(&size),
mip_level_count: descriptor.mipLevelCount,
sample_count: descriptor.sampleCount,
@ -833,11 +805,7 @@ impl GPUDeviceMethods for GPUDevice {
.create_sampler_id(self.device.0.backend());
let compare_enable = descriptor.compare.is_some();
let desc = wgpu_res::SamplerDescriptor {
label: descriptor
.parent
.label
.as_ref()
.map(|s| Cow::Owned(s.to_string())),
label: convert_label(&descriptor.parent),
address_modes: [
convert_address_mode(descriptor.addressModeU),
convert_address_mode(descriptor.addressModeV),
@ -907,12 +875,7 @@ impl GPUDeviceMethods for GPUDevice {
let desc = if valid {
Some(wgpu_pipe::RenderPipelineDescriptor {
label: descriptor
.parent
.parent
.label
.as_ref()
.map(|s| Cow::Owned(s.to_string())),
label: convert_label(&descriptor.parent.parent),
layout: Some(descriptor.parent.layout.id().0),
vertex_stage: wgpu_pipe::ProgrammableStageDescriptor {
module: descriptor.vertexStage.module.id().0,
@ -1048,11 +1011,7 @@ impl GPUDeviceMethods for GPUDevice {
descriptor: &GPURenderBundleEncoderDescriptor,
) -> DomRoot<GPURenderBundleEncoder> {
let desc = wgpu_com::RenderBundleEncoderDescriptor {
label: descriptor
.parent
.label
.as_ref()
.map(|s| Cow::Owned(s.to_string())),
label: convert_label(&descriptor.parent),
color_formats: Cow::Owned(
descriptor
.colorFormats
@ -1323,3 +1282,7 @@ pub fn convert_texture_size_to_wgt(size: &GPUExtent3DDict) -> wgt::Extent3d {
depth: size.depth,
}
}
pub fn convert_label(parent: &GPUObjectDescriptorBase) -> Option<Cow<'static, str>> {
parent.label.as_ref().map(|s| Cow::Owned(s.to_string()))
}