nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-25 16:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[rs] Fix the web backend in code and CI

Browse Source
This commit is contained in:
Dzmitry Malyshau 2021-01-26 11:54:39 -05:00 committed by Dzmitry Malyshau
parent 2f3d6bce6f
commit 8f6804caa1
3 changed files with 112 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/ci.yml vendored
View File

@ -15,8 +15,8 @@ jobs:
os: [macos-10.15, ubuntu-18.04, windows-2019]
steps:
- uses: actions/checkout@v2
- run: cargo check --all-targets --all-features
- run: cargo test --all-targets --no-run
- run: cargo check --all-features
- run: cargo test --no-run
wasm:
runs-on: [ubuntu-18.04]
@ -25,7 +25,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: rustup target add wasm32-unknown-unknown
- run: cargo check --all-targets --all-features --target=wasm32-unknown-unknown
- name: Check WebGPU
run: cargo check --all-targets --target=wasm32-unknown-unknown
- name: Check WebGL
run: cargo check --all-targets --target=wasm32-unknown-unknown --features webgl
docs:
runs-on: [ubuntu-18.04]

10
wgpu/Cargo.toml
View File

@ -26,20 +26,20 @@ webgl = ["wgc"]
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgc]
package = "wgpu-core"
git = "https://github.com/gfx-rs/wgpu"
rev = "b23ece55e7abb8d449fcae09398b2402b0efee99"
rev = "60cd0f7e56f22a7b9d37f36559073cc844adace1"
features = ["raw-window-handle"]
[target.'cfg(target_arch = "wasm32")'.dependencies.wgc]
package = "wgpu-core"
git = "https://github.com/gfx-rs/wgpu"
rev = "b23ece55e7abb8d449fcae09398b2402b0efee99"
rev = "60cd0f7e56f22a7b9d37f36559073cc844adace1"
features = ["raw-window-handle"]
optional = true
[dependencies.wgt]
package = "wgpu-types"
git = "https://github.com/gfx-rs/wgpu"
rev = "b23ece55e7abb8d449fcae09398b2402b0efee99"
rev = "60cd0f7e56f22a7b9d37f36559073cc844adace1"
[dependencies]
arrayvec = "0.5"
@ -50,13 +50,13 @@ tracing = { version = "0.1", default-features = false, features = ["std"] }
serde = { version = "1", features = ["derive"], optional = true }
[dev-dependencies]
cgmath = "0.17"
cgmath = "0.18"
log = "0.4"
png = "0.16"
winit = { version = "0.24.0", features = ["web-sys"] }
rand = { version = "0.7.2", features = ["wasm-bindgen"] }
bytemuck = { version = "1.4", features = ["derive"] }
noise = "0.6"
noise = "0.7"
ddsfile = "0.4"
[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]

135
wgpu/src/backend/web.rs
View File

@ -1,10 +1,9 @@
use crate::{
BindGroupDescriptor, BindGroupLayoutDescriptor, BindingResource, BindingType,
BufferBindingType, BufferDescriptor, CommandEncoderDescriptor, ComputePassDescriptor,
ComputePipelineDescriptor, LoadOp, PipelineLayoutDescriptor, ProgrammableStageDescriptor,
RenderBundleEncoderDescriptor, RenderPipelineDescriptor, SamplerDescriptor,
ShaderModuleDescriptor, ShaderSource, StorageTextureAccess, SwapChainStatus, TextureDescriptor,
TextureViewDescriptor, TextureViewDimension,
BindGroupDescriptor, BindGroupLayoutDescriptor, BindingResource, BufferDescriptor,
CommandEncoderDescriptor, ComputePassDescriptor, ComputePipelineDescriptor, LoadOp,
PipelineLayoutDescriptor, ProgrammableStageDescriptor, RenderBundleEncoderDescriptor,
RenderPipelineDescriptor, SamplerDescriptor, ShaderModuleDescriptor, ShaderSource,
SwapChainStatus, TextureDescriptor, TextureViewDescriptor,
};
use std::{
@ -133,6 +132,18 @@ impl crate::ComputePassInner<Context> for ComputePass {
self.0
.dispatch_indirect_with_f64(&indirect_buffer.0, indirect_offset as f64);
}
fn write_timestamp(&mut self, _query_set: &(), _query_index: u32) {
// Not available in gecko yet
}
fn begin_pipeline_statistics_query(&mut self, _query_set: &(), _query_index: u32) {
// Not available in gecko yet
}
fn end_pipeline_statistics_query(&mut self) {
// Not available in gecko yet
}
}
impl crate::RenderInner<Context> for RenderPass {
@ -157,7 +168,7 @@ impl crate::RenderInner<Context> for RenderPass {
fn set_index_buffer(
&mut self,
buffer: &Sendable<web_sys::GpuBuffer>,
index_format: wgt::IndexFormat,
_index_format: wgt::IndexFormat,
offset: wgt::BufferAddress,
size: Option<wgt::BufferSize>,
) {
@ -282,7 +293,7 @@ impl crate::RenderInner<Context> for RenderBundleEncoder {
fn set_index_buffer(
&mut self,
buffer: &Sendable<web_sys::GpuBuffer>,
index_format: wgt::IndexFormat,
_index_format: wgt::IndexFormat,
offset: wgt::BufferAddress,
size: Option<wgt::BufferSize>,
) {
@ -433,6 +444,18 @@ impl crate::RenderPassInner<Context> for RenderPass {
.collect::<js_sys::Array>();
self.0.execute_bundles(&mapped);
}
fn write_timestamp(&mut self, _query_set: &(), _query_index: u32) {
// Not available in gecko yet
}
fn begin_pipeline_statistics_query(&mut self, _query_set: &(), _query_index: u32) {
// Not available in gecko yet
}
fn end_pipeline_statistics_query(&mut self) {
// Not available in gecko yet
}
}
fn map_texture_format(texture_format: wgt::TextureFormat) -> web_sys::GpuTextureFormat {
@ -666,6 +689,12 @@ fn map_vertex_format(format: wgt::VertexFormat) -> web_sys::GpuVertexFormat {
VertexFormat::Int2 => vf::Int2,
VertexFormat::Int3 => vf::Int3,
VertexFormat::Int4 => vf::Int4,
VertexFormat::Double
| VertexFormat::Double2
| VertexFormat::Double3
| VertexFormat::Double4 => {
panic!("VERTEX_ATTRIBUTE_64BIT feature must be enabled to use Double formats")
}
}
}
@ -746,12 +775,12 @@ fn map_texture_view_dimension(
) -> web_sys::GpuTextureViewDimension {
use web_sys::GpuTextureViewDimension as tvd;
match texture_view_dimension {
TextureViewDimension::D1 => tvd::N1d,
TextureViewDimension::D2 => tvd::N2d,
TextureViewDimension::D2Array => tvd::N2dArray,
TextureViewDimension::Cube => tvd::Cube,
TextureViewDimension::CubeArray => tvd::CubeArray,
TextureViewDimension::D3 => tvd::N3d,
wgt::TextureViewDimension::D1 => tvd::N1d,
wgt::TextureViewDimension::D2 => tvd::N2d,
wgt::TextureViewDimension::D2Array => tvd::N2dArray,
wgt::TextureViewDimension::Cube => tvd::Cube,
wgt::TextureViewDimension::CubeArray => tvd::CubeArray,
wgt::TextureViewDimension::D3 => tvd::N3d,
}
}
@ -849,6 +878,7 @@ impl crate::Context for Context {
type SamplerId = Sendable<web_sys::GpuSampler>;
type BufferId = Sendable<web_sys::GpuBuffer>;
type TextureId = Sendable<web_sys::GpuTexture>;
type QuerySetId = (); //TODO!
type PipelineLayoutId = Sendable<web_sys::GpuPipelineLayout>;
type RenderPipelineId = Sendable<web_sys::GpuRenderPipeline>;
type ComputePipelineId = Sendable<web_sys::GpuComputePipeline>;
@ -927,6 +957,10 @@ impl crate::Context for Context {
)
}
fn adapter_get_timestamp_period(&self, _adapter: &Self::AdapterId) -> f32 {
1.0 //TODO
}
fn adapter_request_device(
&self,
adapter: &Self::AdapterId,
@ -956,8 +990,8 @@ impl crate::Context for Context {
fn adapter_get_swap_chain_preferred_format(
&self,
adapter: &Self::AdapterId,
surface: &Self::SurfaceId,
_adapter: &Self::AdapterId,
_surface: &Self::SurfaceId,
) -> wgt::TextureFormat {
// TODO: web-sys bindings need to be updated to not return a promise
wgt::TextureFormat::Bgra8Unorm
@ -1043,31 +1077,31 @@ impl crate::Context for Context {
.iter()
.map(|bind| {
let mapped_type = match bind.ty {
BindingType::Buffer {
ty: BufferBindingType::Uniform,
wgt::BindingType::Buffer {
ty: wgt::BufferBindingType::Uniform,
..
} => bt::UniformBuffer,
BindingType::Buffer {
ty: BufferBindingType::Storage { read_only: false },
wgt::BindingType::Buffer {
ty: wgt::BufferBindingType::Storage { read_only: false },
..
} => bt::StorageBuffer,
BindingType::Buffer {
ty: BufferBindingType::Storage { read_only: true },
wgt::BindingType::Buffer {
ty: wgt::BufferBindingType::Storage { read_only: true },
..
} => bt::ReadonlyStorageBuffer,
BindingType::Sampler {
wgt::BindingType::Sampler {
comparison: false, ..
} => bt::Sampler,
BindingType::Sampler { .. } => bt::ComparisonSampler,
BindingType::Texture {
wgt::BindingType::Sampler { .. } => bt::ComparisonSampler,
wgt::BindingType::Texture {
multisampled: true, ..
} => bt::MultisampledTexture,
BindingType::Texture { .. } => bt::SampledTexture,
BindingType::StorageTexture {
access: StorageTextureAccess::ReadOnly,
wgt::BindingType::Texture { .. } => bt::SampledTexture,
wgt::BindingType::StorageTexture {
access: wgt::StorageTextureAccess::ReadOnly,
..
} => bt::ReadonlyStorageTexture,
BindingType::StorageTexture { .. } => bt::WriteonlyStorageTexture,
wgt::BindingType::StorageTexture { .. } => bt::WriteonlyStorageTexture,
};
assert!(
@ -1081,26 +1115,26 @@ impl crate::Context for Context {
bind.visibility.bits(),
);
if let BindingType::Buffer {
if let wgt::BindingType::Buffer {
has_dynamic_offset, ..
} = bind.ty
{
mapped_entry.has_dynamic_offset(has_dynamic_offset);
}
if let BindingType::Texture { sample_type, .. } = bind.ty {
if let wgt::BindingType::Texture { sample_type, .. } = bind.ty {
mapped_entry.texture_component_type(map_texture_component_type(sample_type));
}
match bind.ty {
BindingType::Texture { view_dimension, .. }
| BindingType::StorageTexture { view_dimension, .. } => {
wgt::BindingType::Texture { view_dimension, .. }
| wgt::BindingType::StorageTexture { view_dimension, .. } => {
mapped_entry.view_dimension(map_texture_view_dimension(view_dimension));
}
_ => {}
}
if let BindingType::StorageTexture { format, .. } = bind.ty {
if let wgt::BindingType::StorageTexture { format, .. } = bind.ty {
mapped_entry.storage_texture_format(map_texture_format(format));
}
@ -1312,6 +1346,14 @@ impl crate::Context for Context {
Sendable(device.0.create_sampler_with_descriptor(&mapped_desc))
}
fn device_create_query_set(
&self,
_device: &Self::DeviceId,
_desc: &wgt::QuerySetDescriptor,
) -> Self::QuerySetId {
()
}
fn device_create_command_encoder(
&self,
device: &Self::DeviceId,
@ -1487,6 +1529,10 @@ impl crate::Context for Context {
// Dropped automatically
}
fn query_set_drop(&self, _query_set: &Self::QuerySetId) {
// Dropped automatically
}
fn bind_group_drop(&self, _bind_group: &Self::BindGroupId) {
// Dropped automatically
}
@ -1723,6 +1769,27 @@ impl crate::Context for Context {
// encoder.pop_debug_group();
}
fn command_encoder_write_timestamp(
&self,
_encoder: &Self::CommandEncoderId,
_query_set: &Self::QuerySetId,
_query_index: u32,
) {
// Not available in gecko yet
}
fn command_encoder_resolve_query_set(
&self,
_encoder: &Self::CommandEncoderId,
_query_set: &Self::QuerySetId,
_first_query: u32,
_query_count: u32,
_destination: &Self::BufferId,
_destination_offset: wgt::BufferAddress,
) {
// Not available in gecko yet
}
fn render_bundle_encoder_finish(
&self,
encoder: Self::RenderBundleEncoderId,