mirror of
https://github.com/servo/servo.git
synced 2025-07-29 10:10:34 +01:00
Implement GPUComputePassEncoder functions
Implement the `dispatch`, `endPass`, `setBindGroup`, `setPipeline` functions of `GPUComputePassEncoder`.
This commit is contained in:
parent
5597ccf57d
commit
170e9971ac
10 changed files with 109 additions and 83 deletions
|
@ -152,8 +152,8 @@ use tendril::{StrTendril, TendrilSink};
|
|||
use time::{Duration, Timespec, Tm};
|
||||
use uuid::Uuid;
|
||||
use webgpu::{
|
||||
WebGPU, WebGPUAdapter, WebGPUBindGroup, WebGPUBindGroupLayout, WebGPUBuffer,
|
||||
WebGPUCommandBuffer, WebGPUCommandEncoder, WebGPUComputePipeline, WebGPUDevice,
|
||||
wgpu::command::RawPass, WebGPU, WebGPUAdapter, WebGPUBindGroup, WebGPUBindGroupLayout,
|
||||
WebGPUBuffer, WebGPUCommandBuffer, WebGPUCommandEncoder, WebGPUComputePipeline, WebGPUDevice,
|
||||
WebGPUPipelineLayout, WebGPUQueue, WebGPUShaderModule,
|
||||
};
|
||||
use webrender_api::{DocumentId, ImageKey};
|
||||
|
@ -542,7 +542,7 @@ unsafe_no_jsmanaged_fields!(WebGPUShaderModule);
|
|||
unsafe_no_jsmanaged_fields!(WebGPUCommandBuffer);
|
||||
unsafe_no_jsmanaged_fields!(WebGPUCommandEncoder);
|
||||
unsafe_no_jsmanaged_fields!(WebGPUDevice);
|
||||
unsafe_no_jsmanaged_fields!(webgpu::wgpu::command::RawPass);
|
||||
unsafe_no_jsmanaged_fields!(RefCell<Option<RawPass>>);
|
||||
unsafe_no_jsmanaged_fields!(GPUBufferState);
|
||||
unsafe_no_jsmanaged_fields!(WebXRSwapChainId);
|
||||
unsafe_no_jsmanaged_fields!(MediaList);
|
||||
|
|
|
@ -45,6 +45,12 @@ impl GPUBindGroup {
|
|||
}
|
||||
}
|
||||
|
||||
impl GPUBindGroup {
|
||||
pub fn id(&self) -> &WebGPUBindGroup {
|
||||
&self.bind_group
|
||||
}
|
||||
}
|
||||
|
||||
impl GPUBindGroupMethods for GPUBindGroup {
|
||||
/// https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label
|
||||
fn GetLabel(&self) -> Option<DOMString> {
|
||||
|
|
|
@ -17,7 +17,7 @@ use crate::dom::gpucomputepassencoder::GPUComputePassEncoder;
|
|||
use dom_struct::dom_struct;
|
||||
use ipc_channel::ipc;
|
||||
use std::collections::HashSet;
|
||||
use webgpu::{wgpu::command::RawPass, WebGPU, WebGPUCommandEncoder, WebGPURequest};
|
||||
use webgpu::{WebGPU, WebGPUCommandEncoder, WebGPURequest};
|
||||
|
||||
#[dom_struct]
|
||||
pub struct GPUCommandEncoder {
|
||||
|
@ -69,11 +69,7 @@ impl GPUCommandEncoderMethods for GPUCommandEncoder {
|
|||
&self,
|
||||
_descriptor: &GPUComputePassDescriptor,
|
||||
) -> DomRoot<GPUComputePassEncoder> {
|
||||
GPUComputePassEncoder::new(
|
||||
&self.global(),
|
||||
self.channel.clone(),
|
||||
RawPass::new_compute(self.encoder.0),
|
||||
)
|
||||
GPUComputePassEncoder::new(&self.global(), self.channel.clone(), self.encoder)
|
||||
}
|
||||
|
||||
/// https://gpuweb.github.io/gpuweb/#dom-gpucommandencoder-copybuffertobuffer
|
||||
|
|
|
@ -10,8 +10,20 @@ use crate::dom::bindings::reflector::{reflect_dom_object, Reflector};
|
|||
use crate::dom::bindings::root::DomRoot;
|
||||
use crate::dom::bindings::str::DOMString;
|
||||
use crate::dom::globalscope::GlobalScope;
|
||||
use crate::dom::gpubindgroup::GPUBindGroup;
|
||||
use crate::dom::gpucomputepipeline::GPUComputePipeline;
|
||||
use dom_struct::dom_struct;
|
||||
use webgpu::{wgpu::command::RawPass, WebGPU};
|
||||
use std::cell::RefCell;
|
||||
use webgpu::{
|
||||
wgpu::command::{
|
||||
compute_ffi::{
|
||||
wgpu_compute_pass_dispatch, wgpu_compute_pass_set_bind_group,
|
||||
wgpu_compute_pass_set_pipeline,
|
||||
},
|
||||
RawPass,
|
||||
},
|
||||
WebGPU, WebGPUCommandEncoder, WebGPURequest,
|
||||
};
|
||||
|
||||
#[dom_struct]
|
||||
pub struct GPUComputePassEncoder {
|
||||
|
@ -20,26 +32,26 @@ pub struct GPUComputePassEncoder {
|
|||
channel: WebGPU,
|
||||
label: DomRefCell<Option<DOMString>>,
|
||||
#[ignore_malloc_size_of = "defined in wgpu-core"]
|
||||
pass: RawPass,
|
||||
raw_pass: RefCell<Option<RawPass>>,
|
||||
}
|
||||
|
||||
impl GPUComputePassEncoder {
|
||||
pub fn new_inherited(channel: WebGPU, pass: RawPass) -> GPUComputePassEncoder {
|
||||
fn new_inherited(channel: WebGPU, parent: WebGPUCommandEncoder) -> GPUComputePassEncoder {
|
||||
GPUComputePassEncoder {
|
||||
channel,
|
||||
reflector_: Reflector::new(),
|
||||
label: DomRefCell::new(None),
|
||||
pass,
|
||||
raw_pass: RefCell::new(Some(RawPass::new_compute(parent.0))),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new(
|
||||
global: &GlobalScope,
|
||||
channel: WebGPU,
|
||||
pass: RawPass,
|
||||
parent: WebGPUCommandEncoder,
|
||||
) -> DomRoot<GPUComputePassEncoder> {
|
||||
reflect_dom_object(
|
||||
Box::new(GPUComputePassEncoder::new_inherited(channel, pass)),
|
||||
Box::new(GPUComputePassEncoder::new_inherited(channel, parent)),
|
||||
global,
|
||||
GPUComputePassEncoderBinding::Wrap,
|
||||
)
|
||||
|
@ -56,4 +68,49 @@ impl GPUComputePassEncoderMethods for GPUComputePassEncoder {
|
|||
fn SetLabel(&self, value: Option<DOMString>) {
|
||||
*self.label.borrow_mut() = value;
|
||||
}
|
||||
|
||||
#[allow(unsafe_code)]
|
||||
/// https://gpuweb.github.io/gpuweb/#dom-gpucomputepassencoder-dispatch
|
||||
fn Dispatch(&self, x: u32, y: u32, z: u32) {
|
||||
if let Some(raw_pass) = self.raw_pass.borrow_mut().as_mut() {
|
||||
unsafe { wgpu_compute_pass_dispatch(raw_pass, x, y, z) };
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(unsafe_code)]
|
||||
/// https://gpuweb.github.io/gpuweb/#dom-gpurenderpassencoder-endpass
|
||||
fn EndPass(&self) {
|
||||
if let Some(raw_pass) = self.raw_pass.borrow_mut().take() {
|
||||
let (pass_data, id) = unsafe { raw_pass.finish_compute() };
|
||||
|
||||
self.channel
|
||||
.0
|
||||
.send(WebGPURequest::RunComputePass(id, pass_data))
|
||||
.unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(unsafe_code)]
|
||||
/// https://gpuweb.github.io/gpuweb/#dom-gpuprogrammablepassencoder-setbindgroup
|
||||
fn SetBindGroup(&self, index: u32, bind_group: &GPUBindGroup, dynamic_offsets: Vec<u32>) {
|
||||
if let Some(raw_pass) = self.raw_pass.borrow_mut().as_mut() {
|
||||
unsafe {
|
||||
wgpu_compute_pass_set_bind_group(
|
||||
raw_pass,
|
||||
index,
|
||||
bind_group.id().0,
|
||||
dynamic_offsets.as_ptr(),
|
||||
dynamic_offsets.len(),
|
||||
)
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(unsafe_code)]
|
||||
/// https://gpuweb.github.io/gpuweb/#dom-gpucomputepassencoder-setpipeline
|
||||
fn SetPipeline(&self, pipeline: &GPUComputePipeline) {
|
||||
if let Some(raw_pass) = self.raw_pass.borrow_mut().as_mut() {
|
||||
unsafe { wgpu_compute_pass_set_pipeline(raw_pass, pipeline.id().0) };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -42,6 +42,12 @@ impl GPUComputePipeline {
|
|||
}
|
||||
}
|
||||
|
||||
impl GPUComputePipeline {
|
||||
pub fn id(&self) -> &WebGPUComputePipeline {
|
||||
&self.compute_pipeline
|
||||
}
|
||||
}
|
||||
|
||||
impl GPUComputePipelineMethods for GPUComputePipeline {
|
||||
/// https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label
|
||||
fn GetLabel(&self) -> Option<DOMString> {
|
||||
|
|
|
@ -5,11 +5,13 @@
|
|||
// https://gpuweb.github.io/gpuweb/#gpucomputepassencoder
|
||||
[Exposed=(Window, DedicatedWorker), Serializable, Pref="dom.webgpu.enabled"]
|
||||
interface GPUComputePassEncoder {
|
||||
// void setPipeline(GPUComputePipeline pipeline);
|
||||
// void dispatch(unsigned long x, optional unsigned long y = 1, optional unsigned long z = 1);
|
||||
void setPipeline(GPUComputePipeline pipeline);
|
||||
void dispatch(GPUSize32 x, optional GPUSize32 y = 1, optional GPUSize32 z = 1);
|
||||
// void dispatchIndirect(GPUBuffer indirectBuffer, GPUBufferSize indirectOffset);
|
||||
|
||||
// void endPass();
|
||||
void endPass();
|
||||
};
|
||||
GPUComputePassEncoder includes GPUObjectBase;
|
||||
GPUComputePassEncoder includes GPUProgrammablePassEncoder;
|
||||
|
||||
typedef [EnforceRange] unsigned long GPUSize32;
|
||||
|
|
|
@ -5,15 +5,18 @@
|
|||
// https://gpuweb.github.io/gpuweb/#gpuprogrammablepassencoder
|
||||
[Exposed=(Window, DedicatedWorker)]
|
||||
interface mixin GPUProgrammablePassEncoder {
|
||||
// void setBindGroup(unsigned long index, GPUBindGroup bindGroup,
|
||||
// optional sequence<unsigned long> dynamicOffsets = []);
|
||||
void setBindGroup(GPUIndex32 index, GPUBindGroup bindGroup,
|
||||
optional sequence<GPUBufferDynamicOffset> dynamicOffsets = []);
|
||||
|
||||
// void setBindGroup(unsigned long index, GPUBindGroup bindGroup,
|
||||
// void setBindGroup(GPUIndex32 index, GPUBindGroup bindGroup,
|
||||
// Uint32Array dynamicOffsetsData,
|
||||
// unsigned long long dynamicOffsetsDataStart,
|
||||
// unsigned long long dynamicOffsetsDataLength);
|
||||
// GPUSize64 dynamicOffsetsDataStart,
|
||||
// GPUSize64 dynamicOffsetsDataLength);
|
||||
|
||||
// void pushDebugGroup(DOMString groupLabel);
|
||||
// void popDebugGroup();
|
||||
// void insertDebugMarker(DOMString markerLabel);
|
||||
};
|
||||
|
||||
typedef [EnforceRange] unsigned long GPUBufferDynamicOffset;
|
||||
typedef [EnforceRange] unsigned long GPUIndex32;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue