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 08:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix inconsistency in Limits defaults and clean up (#5601)

Browse Source
This commit is contained in:
vero 2024-04-24 21:30:20 -07:00 committed by GitHub
parent 34aab34c00
commit 99fc6a11ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
wgpu-types/src/lib.rs
View File

@ -1143,7 +1143,7 @@ pub struct Limits {
/// pipeline output data, across all color attachments. /// pipeline output data, across all color attachments.
pub max_color_attachment_bytes_per_sample: u32, pub max_color_attachment_bytes_per_sample: u32,
/// Maximum number of bytes used for workgroup memory in a compute entry point. Defaults to /// Maximum number of bytes used for workgroup memory in a compute entry point. Defaults to
/// 16352. Higher is "better". /// 16384. Higher is "better".
pub max_compute_workgroup_storage_size: u32, pub max_compute_workgroup_storage_size: u32,
/// Maximum value of the product of the `workgroup_size` dimensions for a compute entry-point. /// Maximum value of the product of the `workgroup_size` dimensions for a compute entry-point.
/// Defaults to 256. Higher is "better". /// Defaults to 256. Higher is "better".
@ -1184,6 +1184,14 @@ pub struct Limits {
impl Default for Limits { impl Default for Limits {
fn default() -> Self { fn default() -> Self {
Self::defaults()
}
}
impl Limits {
// Rust doesn't allow const in trait implementations, so we break this out
// to allow reusing these defaults in const contexts like `downlevel_defaults`
const fn defaults() -> Self {
Self { Self {
max_texture_dimension_1d: 8192, max_texture_dimension_1d: 8192,
max_texture_dimension_2d: 8192, max_texture_dimension_2d: 8192,
@ -1198,10 +1206,10 @@ impl Default for Limits {
max_storage_buffers_per_shader_stage: 8, max_storage_buffers_per_shader_stage: 8,
max_storage_textures_per_shader_stage: 4, max_storage_textures_per_shader_stage: 4,
max_uniform_buffers_per_shader_stage: 12, max_uniform_buffers_per_shader_stage: 12,
max_uniform_buffer_binding_size: 64 << 10, max_uniform_buffer_binding_size: 64 << 10, // (64 KiB)
max_storage_buffer_binding_size: 128 << 20, max_storage_buffer_binding_size: 128 << 20, // (128 MiB)
max_vertex_buffers: 8, max_vertex_buffers: 8,
max_buffer_size: 256 << 20, max_buffer_size: 256 << 20, // (256 MiB)
max_vertex_attributes: 16, max_vertex_attributes: 16,
max_vertex_buffer_array_stride: 2048, max_vertex_buffer_array_stride: 2048,
min_uniform_buffer_offset_alignment: 256, min_uniform_buffer_offset_alignment: 256,
@ -1221,9 +1229,7 @@ impl Default for Limits {
max_non_sampler_bindings: 1_000_000, max_non_sampler_bindings: 1_000_000,
} }
} }
}
impl Limits {
/// These default limits are guaranteed to be compatible with GLES-3.1, and D3D11 /// These default limits are guaranteed to be compatible with GLES-3.1, and D3D11
/// ///
/// Those limits are as follows (different from default are marked with *): /// Those limits are as follows (different from default are marked with *):
@ -1256,7 +1262,7 @@ impl Limits {
/// max_inter_stage_shader_components: 60, /// max_inter_stage_shader_components: 60,
/// max_color_attachments: 8, /// max_color_attachments: 8,
/// max_color_attachment_bytes_per_sample: 32, /// max_color_attachment_bytes_per_sample: 32,
/// max_compute_workgroup_storage_size: 16352, /// max_compute_workgroup_storage_size: 16352, // *
/// max_compute_invocations_per_workgroup: 256, /// max_compute_invocations_per_workgroup: 256,
/// max_compute_workgroup_size_x: 256, /// max_compute_workgroup_size_x: 256,
/// max_compute_workgroup_size_y: 256, /// max_compute_workgroup_size_y: 256,
@ -1271,37 +1277,11 @@ impl Limits {
max_texture_dimension_1d: 2048, max_texture_dimension_1d: 2048,
max_texture_dimension_2d: 2048, max_texture_dimension_2d: 2048,
max_texture_dimension_3d: 256, max_texture_dimension_3d: 256,
max_texture_array_layers: 256,
max_bind_groups: 4,
max_bindings_per_bind_group: 1000,
max_dynamic_uniform_buffers_per_pipeline_layout: 8,
max_dynamic_storage_buffers_per_pipeline_layout: 4,
max_sampled_textures_per_shader_stage: 16,
max_samplers_per_shader_stage: 16,
max_storage_buffers_per_shader_stage: 4, max_storage_buffers_per_shader_stage: 4,
max_storage_textures_per_shader_stage: 4, max_uniform_buffer_binding_size: 16 << 10, // (16 KiB)
max_uniform_buffers_per_shader_stage: 12, // see: https://developer.apple.com/metal/Metal-Feature-Set-Tables.pdf#page=7
max_uniform_buffer_binding_size: 16 << 10,
max_storage_buffer_binding_size: 128 << 20,
max_vertex_buffers: 8,
max_vertex_attributes: 16,
max_vertex_buffer_array_stride: 2048,
min_subgroup_size: 0,
max_subgroup_size: 0,
max_push_constant_size: 0,
min_uniform_buffer_offset_alignment: 256,
min_storage_buffer_offset_alignment: 256,
max_inter_stage_shader_components: 60,
max_color_attachments: 8,
max_color_attachment_bytes_per_sample: 32,
max_compute_workgroup_storage_size: 16352, max_compute_workgroup_storage_size: 16352,
max_compute_invocations_per_workgroup: 256, ..Self::defaults()
max_compute_workgroup_size_x: 256,
max_compute_workgroup_size_y: 256,
max_compute_workgroup_size_z: 64,
max_compute_workgroups_per_dimension: 65535,
max_buffer_size: 256 << 20,
max_non_sampler_bindings: 1_000_000,
} }
} }