github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Validate strip_index_format (#2177)

Browse Source 
The spec mandates that stripIndexFormat is set even when drawIndexed is
not used. (https://www.w3.org/TR/webgpu/#primitive-state)
There is some recent discussion about this though:
https://github.com/gpuweb/gpuweb/issues/2199
This commit is contained in:
Boris-Chengbiao Zhou
2021-11-15 01:03:33 +01:00
committed by GitHub
parent f25a45f4e2
commit 08b9c46ec4
4 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wgpu-core/src/device/mod.rs
View File

@@ -2211,6 +2211,14 @@ impl<A: HalApi> Device<A> {
);
}
if desc.primitive.strip_index_format.is_none() && desc.primitive.topology.is_strip() {
return Err(
pipeline::CreateRenderPipelineError::NoStripIndexFormatForStripTopology {
topology: desc.primitive.topology,
},
);
}
if desc.primitive.unclipped_depth {
self.require_features(wgt::Features::DEPTH_CLIP_CONTROL)?;
}

2
wgpu-core/src/pipeline.rs
View File

@@ -309,6 +309,8 @@ pub enum CreateRenderPipelineError {
strip_index_format: Option<wgt::IndexFormat>,
topology: wgt::PrimitiveTopology,
},
#[error("strip index format is None while using the strip topology {topology:?}")]
NoStripIndexFormatForStripTopology { topology: wgt::PrimitiveTopology },
#[error("Conservative Rasterization is only supported for wgt::PolygonMode::Fill")]
ConservativeRasterizationNonFillPolygonMode,
#[error(transparent)]

1
wgpu/examples/bunnymark/main.rs
View File

@@ -125,6 +125,7 @@ impl framework::Example for Example {
}),
primitive: wgpu::PrimitiveState {
topology: wgpu::PrimitiveTopology::TriangleStrip,
strip_index_format: Some(wgpu::IndexFormat::Uint16),
..wgpu::PrimitiveState::default()
},
depth_stencil: None,

2
wgpu/examples/mipmap/main.rs
View File

@@ -99,6 +99,7 @@ impl Example {
}),
primitive: wgpu::PrimitiveState {
topology: wgpu::PrimitiveTopology::TriangleStrip,
strip_index_format: Some(wgpu::IndexFormat::Uint16),
..Default::default()
},
depth_stencil: None,
@@ -292,6 +293,7 @@ impl framework::Example for Example {
}),
primitive: wgpu::PrimitiveState {
topology: wgpu::PrimitiveTopology::TriangleStrip,
strip_index_format: Some(wgpu::IndexFormat::Uint16),
front_face: wgpu::FrontFace::Ccw,
cull_mode: Some(wgpu::Face::Back),
..Default::default()