Skip to content

Commit 2fa0bad

Browse files
WIP: remove immediates feature
TODO: reconcile with the capability in Naga (which I think we want to keep?).
1 parent ac3ff3d commit 2fa0bad

19 files changed

Lines changed: 21 additions & 77 deletions

File tree

examples/features/src/ray_shadows/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ fn create_matrix(config: &wgpu::SurfaceConfiguration) -> Uniforms {
8282

8383
impl crate::framework::Example for Example {
8484
fn required_features() -> wgpu::Features {
85-
wgpu::Features::EXPERIMENTAL_RAY_QUERY | wgpu::Features::IMMEDIATES
85+
wgpu::Features::EXPERIMENTAL_RAY_QUERY
8686
}
8787

8888
fn required_downlevel_capabilities() -> wgpu::DownlevelCapabilities {

tests/tests/wgpu-gpu/dispatch_workgroups_indirect.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ pub fn all_tests(vec: &mut Vec<GpuTestInitializer>) {
1616
static NUM_WORKGROUPS_BUILTIN: GpuTestConfiguration = GpuTestConfiguration::new()
1717
.parameters(
1818
TestParameters::default()
19-
.features(wgpu::Features::IMMEDIATES)
2019
.downlevel_flags(
2120
wgpu::DownlevelFlags::COMPUTE_SHADERS | wgpu::DownlevelFlags::INDIRECT_EXECUTION,
2221
)

tests/tests/wgpu-gpu/immediates.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,10 @@ pub fn all_tests(vec: &mut Vec<GpuTestInitializer>) {
2020
/// will remain unchanged.
2121
#[gpu_test]
2222
static PARTIAL_UPDATE: GpuTestConfiguration = GpuTestConfiguration::new()
23-
.parameters(
24-
TestParameters::default()
25-
.features(wgpu::Features::IMMEDIATES)
26-
.limits(wgpu::Limits {
27-
max_immediate_size: 32,
28-
..Default::default()
29-
}),
30-
)
23+
.parameters(TestParameters::default().limits(wgpu::Limits {
24+
max_immediate_size: 32,
25+
..Default::default()
26+
}))
3127
.run_async(partial_update_test);
3228

3329
const SHADER: &str = r#"

tests/tests/wgpu-gpu/regression/issue_3349.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,10 @@ pub fn all_tests(vec: &mut Vec<GpuTestInitializer>) {
2929
/// We then validate the data is correct from every position.
3030
#[gpu_test]
3131
static MULTI_STAGE_DATA_BINDING: GpuTestConfiguration = GpuTestConfiguration::new()
32-
.parameters(
33-
TestParameters::default()
34-
.features(wgpu::Features::IMMEDIATES)
35-
.limits(wgpu::Limits {
36-
max_immediate_size: 16,
37-
..Default::default()
38-
}),
39-
)
32+
.parameters(TestParameters::default().limits(wgpu::Limits {
33+
max_immediate_size: 16,
34+
..Default::default()
35+
}))
4036
.run_async(multi_stage_data_binding_test);
4137

4238
async fn multi_stage_data_binding_test(ctx: TestingContext) {

tests/tests/wgpu-gpu/shader/struct_layout.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ static STORAGE_INPUT: GpuTestConfiguration = GpuTestConfiguration::new()
5454
static IMMEDIATES_INPUT: GpuTestConfiguration = GpuTestConfiguration::new()
5555
.parameters(
5656
TestParameters::default()
57-
.features(Features::IMMEDIATES)
5857
.downlevel_flags(DownlevelFlags::COMPUTE_SHADERS)
5958
.limits(Limits {
6059
max_immediate_size: MAX_BUFFER_SIZE as u32,
@@ -633,7 +632,7 @@ static STORAGE_INPUT_INT64: GpuTestConfiguration = GpuTestConfiguration::new()
633632
static IMMEDIATES_INPUT_INT64: GpuTestConfiguration = GpuTestConfiguration::new()
634633
.parameters(
635634
TestParameters::default()
636-
.features(Features::SHADER_INT64 | Features::IMMEDIATES)
635+
.features(Features::SHADER_INT64)
637636
.downlevel_flags(DownlevelFlags::COMPUTE_SHADERS)
638637
.limits(Limits {
639638
max_immediate_size: MAX_BUFFER_SIZE as u32,

wgpu-core/src/device/resource.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3685,9 +3685,9 @@ impl Device {
36853685
});
36863686
}
36873687

3688-
if desc.immediate_size != 0 {
3689-
self.require_features(wgt::Features::IMMEDIATES)?;
3690-
}
3688+
// if desc.immediate_size != 0 {
3689+
// self.require_features(wgt::Features::IMMEDIATES)?;
3690+
// }
36913691
if self.limits.max_immediate_size < desc.immediate_size {
36923692
return Err(Error::ImmediateRangeTooLarge {
36933693
size: desc.immediate_size,

wgpu-core/src/indirect_validation/dispatch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ impl Dispatch {
9393
let module = panic!("Indirect validation requires the wgsl feature flag to be enabled!");
9494

9595
let info = crate::device::create_validator(
96-
wgt::Features::IMMEDIATES,
96+
wgt::Features::empty(),
9797
wgt::DownlevelFlags::empty(),
9898
naga::valid::ValidationFlags::all(),
9999
)

wgpu-core/src/indirect_validation/draw.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ fn create_validation_module(
531531
let module = panic!("Indirect validation requires the wgsl feature flag to be enabled!");
532532

533533
let info = crate::device::create_validator(
534-
wgt::Features::IMMEDIATES,
534+
wgt::Features::empty(),
535535
wgt::DownlevelFlags::empty(),
536536
naga::valid::ValidationFlags::all(),
537537
)

wgpu-core/src/timestamp_normalization/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ impl TimestampNormalizer {
151151
panic!("Timestamp normalization requires the wgsl feature flag to be enabled!");
152152

153153
let info = crate::device::create_validator(
154-
wgt::Features::IMMEDIATES,
154+
wgt::Features::empty(),
155155
wgt::DownlevelFlags::empty(),
156156
naga::valid::ValidationFlags::all(),
157157
)

wgpu-hal/src/dx12/adapter.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,6 @@ impl super::Adapter {
473473
| wgt::Features::TEXTURE_COMPRESSION_BC_SLICED_3D
474474
| wgt::Features::CLEAR_TEXTURE
475475
| wgt::Features::TEXTURE_FORMAT_16BIT_NORM
476-
| wgt::Features::IMMEDIATES
477476
| wgt::Features::PRIMITIVE_INDEX
478477
| wgt::Features::RG11B10UFLOAT_RENDERABLE
479478
| wgt::Features::DUAL_SOURCE_BLENDING

0 commit comments

Comments
 (0)