Wgpu 0.20 #13186
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -159,6 +159,7 @@ struct FrameData { | |
| timestamps_query_set: Option<QuerySet>, | ||
| num_timestamps: u32, | ||
| supports_timestamps_inside_passes: bool, | ||
| supports_timestamps_inside_encoders: bool, | ||
| pipeline_statistics_query_set: Option<QuerySet>, | ||
| num_pipeline_statistics: u32, | ||
| buffer_size: u64, | ||
|
|
@@ -225,6 +226,8 @@ impl FrameData { | |
| num_timestamps: 0, | ||
| supports_timestamps_inside_passes: features | ||
| .contains(Features::TIMESTAMP_QUERY_INSIDE_PASSES), | ||
| supports_timestamps_inside_encoders: features | ||
| .contains(Features::TIMESTAMP_QUERY_INSIDE_ENCODERS), | ||
| pipeline_statistics_query_set, | ||
| num_pipeline_statistics: 0, | ||
| buffer_size, | ||
|
|
@@ -252,6 +255,11 @@ impl FrameData { | |
| encoder: &mut impl WriteTimestamp, | ||
| is_inside_pass: bool, | ||
| ) -> Option<u32> { | ||
| // `encoder.write_timestamp` is unsupported on WebGPU. | ||
| if !self.supports_timestamps_inside_encoders { | ||
| return None; | ||
| } | ||
|
|
||
| if is_inside_pass && !self.supports_timestamps_inside_passes { | ||
| return None; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1237,6 +1237,7 @@ impl VertexFormatSize for VertexFormat { | |
| VertexFormat::Unorm8x4 => 4, | ||
| VertexFormat::Snorm8x2 => 2, | ||
| VertexFormat::Snorm8x4 => 4, | ||
| VertexFormat::Unorm10_10_10_2 => 4, | ||
| VertexFormat::Uint16x2 => 2 * 2, | ||
| VertexFormat::Uint16x4 => 2 * 4, | ||
| VertexFormat::Sint16x2 => 2 * 2, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,9 +42,9 @@ pub use wgpu::{ | |
| Extent3d, Face, Features as WgpuFeatures, FilterMode, FragmentState as RawFragmentState, | ||
| FrontFace, ImageCopyBuffer, ImageCopyBufferBase, ImageCopyTexture, ImageCopyTextureBase, | ||
| ImageDataLayout, ImageSubresourceRange, IndexFormat, Limits as WgpuLimits, LoadOp, Maintain, | ||
| MapMode, MultisampleState, Operations, Origin3d, PipelineCompilationOptions, PipelineLayout, | ||
| PipelineLayoutDescriptor, PolygonMode, PrimitiveState, PrimitiveTopology, PushConstantRange, | ||
| RenderPassColorAttachment, RenderPassDepthStencilAttachment, RenderPassDescriptor, | ||
| RenderPipelineDescriptor as RawRenderPipelineDescriptor, SamplerBindingType, SamplerDescriptor, | ||
| ShaderModule, ShaderModuleDescriptor, ShaderSource, ShaderStages, StencilFaceState, | ||
| StencilOperation, StencilState, StorageTextureAccess, StoreOp, TextureAspect, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,7 +25,10 @@ use std::{ | |
| use thiserror::Error; | ||
| #[cfg(feature = "shader_format_spirv")] | ||
| use wgpu::util::make_spirv; | ||
| use wgpu::{ | ||
| DownlevelFlags, Features, PipelineCompilationOptions, | ||
| VertexBufferLayout as RawVertexBufferLayout, | ||
| }; | ||
|
|
||
| use crate::render_resource::resource_macros::*; | ||
|
|
||
|
|
@@ -170,73 +173,17 @@ impl ShaderDefVal { | |
|
|
||
| impl ShaderCache { | ||
| fn new(render_device: &RenderDevice, render_adapter: &RenderAdapter) -> Self { | ||
| let (capabilities, subgroup_stages) = get_capabilities( | ||
| render_device.features(), | ||
| render_adapter.get_downlevel_capabilities().flags, | ||
| ); | ||
|
|
||
| #[cfg(debug_assertions)] | ||
| let composer = naga_oil::compose::Composer::default(); | ||
| #[cfg(not(debug_assertions))] | ||
| let composer = naga_oil::compose::Composer::non_validating(); | ||
|
|
||
| let composer = composer.with_capabilities(capabilities, subgroup_stages); | ||
|
|
||
| Self { | ||
| composer, | ||
|
|
@@ -791,6 +738,12 @@ impl PipelineCache { | |
| ) | ||
| }); | ||
|
|
||
| // TODO: Expose this somehow | ||
| let compilation_options = PipelineCompilationOptions { | ||
| constants: &std::collections::HashMap::new(), | ||
| zero_initialize_workgroup_memory: false, | ||
| }; | ||
|
|
||
| let descriptor = RawRenderPipelineDescriptor { | ||
| multiview: None, | ||
| depth_stencil: descriptor.depth_stencil.clone(), | ||
|
|
@@ -802,13 +755,17 @@ impl PipelineCache { | |
| buffers: &vertex_buffer_layouts, | ||
| entry_point: descriptor.vertex.entry_point.deref(), | ||
| module: &vertex_module, | ||
| // TODO: Should this be the same as the fragment compilation options? | ||
| compilation_options: compilation_options.clone(), | ||
| }, | ||
| fragment: fragment_data | ||
| .as_ref() | ||
| .map(|(module, entry_point, targets)| RawFragmentState { | ||
| entry_point, | ||
| module, | ||
| targets, | ||
| // TODO: Should this be the same as the vertex compilation options? | ||
| compilation_options, | ||
| }), | ||
| }; | ||
|
|
||
|
|
@@ -861,6 +818,11 @@ impl PipelineCache { | |
| layout: layout.as_deref(), | ||
| module: &compute_module, | ||
| entry_point: &descriptor.entry_point, | ||
| // TODO: Expose this somehow | ||
| compilation_options: PipelineCompilationOptions { | ||
| constants: &std::collections::HashMap::new(), | ||
| zero_initialize_workgroup_memory: false, | ||
| }, | ||
| }; | ||
|
|
||
| Ok(Pipeline::ComputePipeline( | ||
|
|
@@ -1027,3 +989,89 @@ pub enum PipelineCacheError { | |
| #[error("Could not create shader module: {0}")] | ||
| CreateShaderModule(String), | ||
| } | ||
|
|
||
| // TODO: This needs to be kept up to date with the capabilities in the `create_validator` function in wgpu-core | ||
| // https://github.com/gfx-rs/wgpu/blob/trunk/wgpu-core/src/device/mod.rs#L449 | ||
| // We use a modified version of the `create_validator` function because `naga_oil`'s composer stores the capabilities | ||
| // and subgroup shader stages instead of a `Validator`. | ||
| // We also can't use that function because `wgpu-core` isn't included in WebGPU builds. | ||
| /// Get the device capabilities and subgroup support for use in `naga_oil`. | ||
| fn get_capabilities( | ||
| features: Features, | ||
| downlevel: DownlevelFlags, | ||
| ) -> (Capabilities, naga::valid::ShaderStages) { | ||
| let mut capabilities = Capabilities::empty(); | ||
| capabilities.set( | ||
| Capabilities::PUSH_CONSTANT, | ||
| features.contains(Features::PUSH_CONSTANTS), | ||
| ); | ||
| capabilities.set( | ||
| Capabilities::FLOAT64, | ||
| features.contains(Features::SHADER_F64), | ||
| ); | ||
| capabilities.set( | ||
| Capabilities::PRIMITIVE_INDEX, | ||
| features.contains(Features::SHADER_PRIMITIVE_INDEX), | ||
| ); | ||
| capabilities.set( | ||
| Capabilities::SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING, | ||
| features.contains(Features::SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING), | ||
| ); | ||
| capabilities.set( | ||
| Capabilities::UNIFORM_BUFFER_AND_STORAGE_TEXTURE_ARRAY_NON_UNIFORM_INDEXING, | ||
| features.contains(Features::UNIFORM_BUFFER_AND_STORAGE_TEXTURE_ARRAY_NON_UNIFORM_INDEXING), | ||
| ); | ||
| // TODO: This needs a proper wgpu feature | ||
| capabilities.set( | ||
| Capabilities::SAMPLER_NON_UNIFORM_INDEXING, | ||
| features.contains(Features::SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING), | ||
| ); | ||
| capabilities.set( | ||
| Capabilities::STORAGE_TEXTURE_16BIT_NORM_FORMATS, | ||
| features.contains(Features::TEXTURE_FORMAT_16BIT_NORM), | ||
| ); | ||
| capabilities.set( | ||
| Capabilities::MULTIVIEW, | ||
| features.contains(Features::MULTIVIEW), | ||
| ); | ||
| capabilities.set( | ||
| Capabilities::EARLY_DEPTH_TEST, | ||
| features.contains(Features::SHADER_EARLY_DEPTH_TEST), | ||
| ); | ||
| capabilities.set( | ||
| Capabilities::SHADER_INT64, | ||
| features.contains(Features::SHADER_INT64), | ||
| ); | ||
| capabilities.set( | ||
| Capabilities::MULTISAMPLED_SHADING, | ||
| downlevel.contains(DownlevelFlags::MULTISAMPLED_SHADING), | ||
| ); | ||
| capabilities.set( | ||
| Capabilities::DUAL_SOURCE_BLENDING, | ||
| features.contains(Features::DUAL_SOURCE_BLENDING), | ||
| ); | ||
| capabilities.set( | ||
| Capabilities::CUBE_ARRAY_TEXTURES, | ||
| downlevel.contains(DownlevelFlags::CUBE_ARRAY_TEXTURES), | ||
| ); | ||
| capabilities.set( | ||
| Capabilities::SUBGROUP, | ||
| features.intersects(Features::SUBGROUP | Features::SUBGROUP_VERTEX), | ||
| ); | ||
| capabilities.set( | ||
| Capabilities::SUBGROUP_BARRIER, | ||
| features.intersects(Features::SUBGROUP_BARRIER), | ||
| ); | ||
|
|
||
| let mut subgroup_stages = naga::valid::ShaderStages::empty(); | ||
| subgroup_stages.set( | ||
| naga::valid::ShaderStages::COMPUTE | naga::valid::ShaderStages::FRAGMENT, | ||
| features.contains(Features::SUBGROUP), | ||
| ); | ||
| subgroup_stages.set( | ||
| naga::valid::ShaderStages::VERTEX, | ||
| features.contains(Features::SUBGROUP_VERTEX), | ||
| ); | ||
|
|
||
| (capabilities, subgroup_stages) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -326,6 +326,18 @@ pub async fn initialize_renderer( | |
| max_non_sampler_bindings: limits | ||
| .max_non_sampler_bindings | ||
| .min(constrained_limits.max_non_sampler_bindings), | ||
| max_color_attachments: limits | ||
| .max_color_attachments | ||
| .min(constrained_limits.max_color_attachments), | ||
| max_color_attachment_bytes_per_sample: limits | ||
| .max_color_attachment_bytes_per_sample | ||
| .min(constrained_limits.max_color_attachment_bytes_per_sample), | ||
| min_subgroup_size: limits | ||
| .min_subgroup_size | ||
| .max(constrained_limits.min_subgroup_size), | ||
| max_subgroup_size: limits | ||
| .max_subgroup_size | ||
| .min(constrained_limits.max_subgroup_size), | ||
| }; | ||
| } | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If 0.20.0 was so problematic, we should prevent it from being pulled in by making 0.20.1 the minimum version.