Skip to content

Commit de48476

Browse files
andyleisersonteoxoy
andcommitted
Apply suggestions from code review
Co-authored-by: Teodor Tanasoaia <28601907+teoxoy@users.noreply.github.com>
1 parent 85fe16d commit de48476

File tree

1 file changed

+9
-24
lines changed

1 file changed

+9
-24
lines changed

wgpu-core/src/limits.rs

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -307,10 +307,10 @@ const UPLEVEL: Bucket = Bucket {
307307
max_inter_stage_shader_variables: 28,
308308
// use default max_sampled_textures_per_shader_stage
309309
// use default max_samplers_per_shader_stage
310-
max_storage_buffer_binding_size: 1 << 27, // 128 MB
310+
// use default max_storage_buffer_binding_size
311311
// wgpu does not implement max_storage_buffers_in_fragment_stage: 8,
312312
// wgpu does not implement max_storage_buffers_in_vertex_stage: 8,
313-
max_storage_buffers_per_shader_stage: 8,
313+
// use default max_storage_buffers_per_shader_stage
314314
// wgpu does not implement max_storage_textures_in_fragment_stage: 8,
315315
// wgpu does not implement max_storage_textures_in_vertex_stage: 8,
316316
max_storage_textures_per_shader_stage: 8,
@@ -346,7 +346,7 @@ const UPLEVEL: Bucket = Bucket {
346346
.union(Features::BGRA8UNORM_STORAGE)
347347
.union(Features::FLOAT32_FILTERABLE)
348348
// FLOAT32_BLENDABLE not implemented in wgpu dx12 backend; https://github.com/gfx-rs/wgpu/issues/6555
349-
// CLIP_DISTANCES not implemented in wgpu Metal backend; https://github.com/gfx-rs/wgpu/issues/6236
349+
// CLIP_DISTANCES not implemented in wgpu dx12 or Metal backend; https://github.com/gfx-rs/wgpu/issues/6236
350350
.union(Features::DUAL_SOURCE_BLENDING)
351351
// TIER1/TIER2 not implemented in wgpu; https://github.com/gfx-rs/wgpu/issues/8122
352352
.union(Features::PRIMITIVE_INDEX)
@@ -396,10 +396,7 @@ const BUCKET_A2: Bucket = Bucket {
396396
subgroup_max_size: 64,
397397
..UPLEVEL.info
398398
},
399-
features: UPLEVEL
400-
.features
401-
.union(Features::SHADER_F16)
402-
.union(Features::CLIP_DISTANCES),
399+
features: UPLEVEL.features.union(Features::SHADER_F16),
403400
};
404401

405402
// e.g. Intel Arc, UHD 600 Series, Iris Xe
@@ -417,10 +414,7 @@ const BUCKET_I1: Bucket = Bucket {
417414
subgroup_max_size: 32,
418415
..UPLEVEL.info
419416
},
420-
features: UPLEVEL
421-
.features
422-
.union(Features::SHADER_F16)
423-
.union(Features::CLIP_DISTANCES),
417+
features: UPLEVEL.features.union(Features::SHADER_F16),
424418
};
425419

426420
// e.g. GeForce GTX 1650, GeForce RTX 20, 30, 40, 50 Series
@@ -440,10 +434,7 @@ const BUCKET_N1: Bucket = Bucket {
440434
subgroup_max_size: 32,
441435
..UPLEVEL.info
442436
},
443-
features: UPLEVEL
444-
.features
445-
.union(Features::SHADER_F16)
446-
.union(Features::CLIP_DISTANCES),
437+
features: UPLEVEL.features.union(Features::SHADER_F16),
447438
};
448439

449440
// e.g. Radeon RX 6000, 7000, 9000 Series
@@ -462,10 +453,7 @@ const BUCKET_A1: Bucket = Bucket {
462453
subgroup_max_size: 64,
463454
..UPLEVEL.info
464455
},
465-
features: UPLEVEL
466-
.features
467-
.union(Features::SHADER_F16)
468-
.union(Features::CLIP_DISTANCES),
456+
features: UPLEVEL.features.union(Features::SHADER_F16),
469457
};
470458

471459
// e.g. GeForce GTX 1050, Radeon WX 5100
@@ -485,7 +473,7 @@ const BUCKET_NO_F16: Bucket = Bucket {
485473
subgroup_max_size: 64,
486474
..UPLEVEL.info
487475
},
488-
features: UPLEVEL.features.union(Features::CLIP_DISTANCES),
476+
features: UPLEVEL.features,
489477
};
490478

491479
const BUCKET_LLVMPIPE: Bucket = Bucket {
@@ -523,10 +511,7 @@ const BUCKET_WARP: Bucket = Bucket {
523511
subgroup_min_size: 4,
524512
subgroup_max_size: 128,
525513
},
526-
features: UPLEVEL
527-
.features
528-
.union(Features::SHADER_F16)
529-
.union(Features::CLIP_DISTANCES),
514+
features: UPLEVEL.features.union(Features::SHADER_F16),
530515
};
531516

532517
// WebGPU default limits, not a fallback adapter

0 commit comments

Comments
 (0)