Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement GPUComputePassEncoder functions

Browse source 
Implement the `dispatch`, `endPass`, `setBindGroup`, `setPipeline` functions of `GPUComputePassEncoder`.
This commit is contained in:
Istvan Miklos 2020-02-18 11:29:21 +01:00
parent 5597ccf57d
commit 170e9971ac
10 changed files with 109 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Cargo.lock generated
View file

@ -212,9 +212,9 @@ dependencies = [
"lazy_static",
"libc",
"log",
"mach 0.3.2",
"mach",
"msg",
"nix 0.14.1",
"nix",
"serde_json",
"unwind-sys",
]
@ -248,23 +248,6 @@ dependencies = [
"byteorder",
]
[[package]]
name = "battery"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36a698e449024a5d18994a815998bf5e2e4bc1883e35a7d7ba95b6b69ee45907"
dependencies = [
"cfg-if",
"core-foundation 0.6.4",
"lazycell",
"libc",
"mach 0.2.3",
"nix 0.15.0",
"num-traits",
"uom",
"winapi",
]
[[package]]
name = "binary-space-partition"
version = "0.1.2"
@ -3266,15 +3249,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
[[package]]
name = "mach"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1"
dependencies = [
"libc",
]
[[package]]
name = "mach"
version = "0.3.2"
@ -3749,19 +3723,6 @@ dependencies = [
"void",
]
[[package]]
name = "nix"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229"
dependencies = [
"bitflags",
"cc",
"cfg-if",
"libc",
"void",
]
[[package]]
name = "nodrop"
version = "0.1.12"
@ -5517,7 +5478,7 @@ dependencies = [
"dlib",
"lazy_static",
"memmap",
"nix 0.14.1",
"nix",
"wayland-client",
"wayland-commons",
"wayland-protocols",
@ -5753,7 +5714,7 @@ dependencies = [
"lazy_static",
"libc",
"log",
"mach 0.3.2",
"mach",
"objc",
"osmesa-sys",
"wayland-sys 0.24.0",
@ -5780,7 +5741,7 @@ dependencies = [
"lazy_static",
"libc",
"log",
"mach 0.3.2",
"mach",
"objc",
"parking_lot",
"wayland-sys 0.24.0",
@ -6358,16 +6319,6 @@ dependencies = [
"pkg-config",
]
[[package]]
name = "uom"
version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cec796ec5f7ac557631709079168286056205c51c60aac33f51764bdc7b8dc4"
dependencies = [
"num-traits",
"typenum",
]
[[package]]
name = "url"
version = "2.1.0"
@ -6493,7 +6444,7 @@ dependencies = [
"bitflags",
"downcast-rs",
"libc",
"nix 0.14.1",
"nix",
"wayland-commons",
"wayland-scanner",
"wayland-sys 0.21.13",
@ -6505,7 +6456,7 @@ version = "0.21.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40c08896768b667e1df195d88a62a53a2d1351a1ed96188be79c196b35bb32ec"
dependencies = [
"nix 0.14.1",
"nix",
"wayland-sys 0.21.13",
]
@ -6758,10 +6709,9 @@ dependencies = [
[[package]]
name = "wgpu-core"
version = "0.1.0"
source = "git+https://github.com/gfx-rs/wgpu#d4a46cb60e71d6b108e9052cc581e52e44a16a44"
source = "git+https://github.com/gfx-rs/wgpu#4f937c04e12572a56d96a160c30888ceecc930a9"
dependencies = [
"arrayvec 0.5.1",
"battery",
"bitflags",
"copyless",
"fxhash",

6
components/script/dom/bindings/trace.rs
View file

@ -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);

6
components/script/dom/gpubindgroup.rs
View file

@ -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> {

8
components/script/dom/gpucommandencoder.rs
View file

@ -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

69
components/script/dom/gpucomputepassencoder.rs
View file

@ -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) };
}
}
}

6
components/script/dom/gpucomputepipeline.rs
View file

@ -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> {

8
components/script/dom/webidls/GPUComputePassEncoder.webidl
View file

@ -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;

13
components/script/dom/webidls/GPUProgrammablePassEncoder.webidl
View file

@ -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;

8
components/webgpu/lib.rs
View file

@ -103,6 +103,7 @@ pub enum WebGPURequest {
// wgpu::command::CommandBufferDescriptor,
),
Submit(wgpu::id::QueueId, Vec<wgpu::id::CommandBufferId>),
RunComputePass(wgpu::id::CommandEncoderId, Vec<u8>),
}
#[derive(Clone, Debug, Deserialize, Serialize)]
@ -418,6 +419,13 @@ impl WGPU {
&command_buffer_ids
));
},
WebGPURequest::RunComputePass(command_encoder_id, raw_data) => {
let global = &self.global;
gfx_select!(command_encoder_id => global.command_encoder_run_compute_pass(
command_encoder_id,
&raw_data
));
},
WebGPURequest::Exit(sender) => {
self.deinit();
if let Err(e) = sender.send(()) {

2
servo-tidy.toml
View file

@ -31,8 +31,6 @@ packages = [
"cgl",
"cocoa",
"gleam",
"mach",
"nix",
"peek-poke",
"peek-poke-derive",
"wayland-sys",