nonuniform: sampling images is always declared NonUniform

Firestar99 · Firestar99 · commit a01aafbac8e5 · 2025-03-30T17:22:48.000+02:00
diff --git a/crates/spirv-std/src/image.rs b/crates/spirv-std/src/image.rs
diff --git a/tests/ui/image/components.rs b/tests/ui/image/components.rs
@@ -1,5 +1,5 @@
 // build-pass
-// compile-flags: -Ctarget-feature=+StorageImageExtendedFormats
+// compile-flags: -Ctarget-feature=+StorageImageExtendedFormats,+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use glam::{Vec2, Vec3, Vec4};
 use spirv_std::spirv;
diff --git a/tests/ui/image/fetch.rs b/tests/ui/image/fetch.rs
@@ -1,4 +1,5 @@
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, arch};
diff --git a/tests/ui/image/format.rs b/tests/ui/image/format.rs
@@ -1,4 +1,5 @@
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, arch};
diff --git a/tests/ui/image/gather.rs b/tests/ui/image/gather.rs
@@ -1,5 +1,6 @@
 // Test `OpImageGather`
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use core::arch::asm;
 use spirv_std::spirv;
diff --git a/tests/ui/image/gather_err.rs b/tests/ui/image/gather_err.rs
@@ -1,6 +1,6 @@
 // build-fail
 // normalize-stderr-test "\S*/crates/spirv-std/src/" -> "$$SPIRV_STD_SRC/"
-// compile-flags: -Ctarget-feature=+Sampled1D
+// compile-flags: -Ctarget-feature=+Sampled1D,+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::{Image, Sampler, arch, spirv};
 
diff --git a/tests/ui/image/gather_err.stderr b/tests/ui/image/gather_err.stderr
@@ -9,12 +9,12 @@ error[E0277]: the trait bound `Image<f32, 0, 2, 0, 0, 1, 0, 4>: HasGather` is no
               Image<SampledType, 3, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
               Image<SampledType, 4, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
 note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#1}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>::gather`
-   --> $SPIRV_STD_SRC/image.rs:197:15
+   --> $SPIRV_STD_SRC/image.rs:199:15
     |
-190 |     pub fn gather<F>(
+192 |     pub fn gather<F>(
     |            ------ required by a bound in this associated function
 ...
-197 |         Self: HasGather,
+199 |         Self: HasGather,
     |               ^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#1}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>::gather`
 
 error[E0277]: the trait bound `Image<f32, 2, 2, 0, 0, 1, 0, 4>: HasGather` is not satisfied
@@ -28,12 +28,12 @@ error[E0277]: the trait bound `Image<f32, 2, 2, 0, 0, 1, 0, 4>: HasGather` is no
               Image<SampledType, 3, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
               Image<SampledType, 4, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
 note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#1}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>::gather`
-   --> $SPIRV_STD_SRC/image.rs:197:15
+   --> $SPIRV_STD_SRC/image.rs:199:15
     |
-190 |     pub fn gather<F>(
+192 |     pub fn gather<F>(
     |            ------ required by a bound in this associated function
 ...
-197 |         Self: HasGather,
+199 |         Self: HasGather,
     |               ^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#1}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>::gather`
 
 error: aborting due to 2 previous errors
diff --git a/tests/ui/image/image_with.rs b/tests/ui/image/image_with.rs
@@ -1,4 +1,5 @@
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, Sampler, arch, image::ImageWithMethods, image::sample_with};
diff --git a/tests/ui/image/issue_527.rs b/tests/ui/image/issue_527.rs
@@ -1,5 +1,5 @@
 // build-pass
-// compile-flags: -C target-feature=+StorageImageWriteWithoutFormat
+// compile-flags: -C target-feature=+StorageImageWriteWithoutFormat,+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use glam::*;
 use spirv_std::spirv;
diff --git a/tests/ui/image/query/query_levels.rs b/tests/ui/image/query/query_levels.rs
@@ -1,5 +1,5 @@
 // build-pass
-// compile-flags: -C target-feature=+ImageQuery
+// compile-flags: -C target-feature=+ImageQuery,+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, arch};
diff --git a/tests/ui/image/query/query_levels_err.stderr b/tests/ui/image/query/query_levels_err.stderr
@@ -10,12 +10,12 @@ error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4>: HasQueryLevels`
               Image<SampledType, 2, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>
               Image<SampledType, 3, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>
 note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>::query_levels`
-   --> $SPIRV_STD_SRC/image.rs:881:15
+   --> $SPIRV_STD_SRC/image.rs:951:15
     |
-879 |     pub fn query_levels(&self) -> u32
+949 |     pub fn query_levels(&self) -> u32
     |            ------------ required by a bound in this associated function
-880 |     where
-881 |         Self: HasQueryLevels,
+950 |     where
+951 |         Self: HasQueryLevels,
     |               ^^^^^^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>::query_levels`
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/image/query/query_lod.rs b/tests/ui/image/query/query_lod.rs
@@ -1,5 +1,5 @@
 // build-pass
-// compile-flags: -C target-feature=+ImageQuery
+// compile-flags: -C target-feature=+ImageQuery,+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, Sampler, arch};
diff --git a/tests/ui/image/query/query_lod_err.rs b/tests/ui/image/query/query_lod_err.rs
@@ -1,6 +1,6 @@
 // build-fail
 // normalize-stderr-test "\S*/crates/spirv-std/src/" -> "$$SPIRV_STD_SRC/"
-// compile-flags: -C target-feature=+ImageQuery
+// compile-flags: -C target-feature=+ImageQuery,+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::{Image, Sampler, arch, spirv};
 
diff --git a/tests/ui/image/query/query_lod_err.stderr b/tests/ui/image/query/query_lod_err.stderr
@@ -10,12 +10,12 @@ error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4>: HasQueryLevels`
               Image<SampledType, 2, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>
               Image<SampledType, 3, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>
 note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>::query_lod`
-   --> $SPIRV_STD_SRC/image.rs:907:15
+   --> $SPIRV_STD_SRC/image.rs:980:15
     |
-901 |     pub fn query_lod(
+974 |     pub fn query_lod(
     |            --------- required by a bound in this associated function
 ...
-907 |         Self: HasQueryLevels,
+980 |         Self: HasQueryLevels,
     |               ^^^^^^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>::query_lod`
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/image/query/query_samples.rs b/tests/ui/image/query/query_samples.rs
@@ -1,5 +1,5 @@
 // build-pass
-// compile-flags: -C target-feature=+ImageQuery
+// compile-flags: -C target-feature=+ImageQuery,+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, arch};
diff --git a/tests/ui/image/query/query_size.rs b/tests/ui/image/query/query_size.rs
@@ -1,5 +1,5 @@
 // build-pass
-// compile-flags: -C target-feature=+ImageQuery
+// compile-flags: -C target-feature=+ImageQuery,+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, arch};
diff --git a/tests/ui/image/query/query_size_err.rs b/tests/ui/image/query/query_size_err.rs
@@ -1,6 +1,6 @@
 // build-fail
 // normalize-stderr-test "\S*/crates/spirv-std/src/" -> "$$SPIRV_STD_SRC/"
-// compile-flags: -C target-feature=+ImageQuery
+// compile-flags: -C target-feature=+ImageQuery,+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::{Image, arch, spirv};
 
diff --git a/tests/ui/image/query/query_size_err.stderr b/tests/ui/image/query/query_size_err.stderr
@@ -1,27 +1,27 @@
 error[E0277]: the trait bound `Image<f32, 1, 2, 0, 0, 1, 0, 4>: HasQuerySize` is not satisfied
-   --> $DIR/query_size_err.rs:12:21
-    |
-12  |     *output = image.query_size();
-    |                     ^^^^^^^^^^ the trait `HasQuerySize` is not implemented for `Image<f32, 1, 2, 0, 0, 1, 0, 4>`
-    |
-    = help: the following other types implement trait `HasQuerySize`:
-              Image<SampledType, 0, DEPTH, ARRAYED, 0, 0, FORMAT, COMPONENTS>
-              Image<SampledType, 0, DEPTH, ARRAYED, 0, 2, FORMAT, COMPONENTS>
-              Image<SampledType, 0, DEPTH, ARRAYED, 1, SAMPLED, FORMAT, COMPONENTS>
-              Image<SampledType, 1, DEPTH, ARRAYED, 0, 0, FORMAT, COMPONENTS>
-              Image<SampledType, 1, DEPTH, ARRAYED, 0, 2, FORMAT, COMPONENTS>
-              Image<SampledType, 1, DEPTH, ARRAYED, 1, SAMPLED, FORMAT, COMPONENTS>
-              Image<SampledType, 2, DEPTH, ARRAYED, 0, 0, FORMAT, COMPONENTS>
-              Image<SampledType, 2, DEPTH, ARRAYED, 0, 2, FORMAT, COMPONENTS>
-            and 6 others
+    --> $DIR/query_size_err.rs:12:21
+     |
+12   |     *output = image.query_size();
+     |                     ^^^^^^^^^^ the trait `HasQuerySize` is not implemented for `Image<f32, 1, 2, 0, 0, 1, 0, 4>`
+     |
+     = help: the following other types implement trait `HasQuerySize`:
+               Image<SampledType, 0, DEPTH, ARRAYED, 0, 0, FORMAT, COMPONENTS>
+               Image<SampledType, 0, DEPTH, ARRAYED, 0, 2, FORMAT, COMPONENTS>
+               Image<SampledType, 0, DEPTH, ARRAYED, 1, SAMPLED, FORMAT, COMPONENTS>
+               Image<SampledType, 1, DEPTH, ARRAYED, 0, 0, FORMAT, COMPONENTS>
+               Image<SampledType, 1, DEPTH, ARRAYED, 0, 2, FORMAT, COMPONENTS>
+               Image<SampledType, 1, DEPTH, ARRAYED, 1, SAMPLED, FORMAT, COMPONENTS>
+               Image<SampledType, 2, DEPTH, ARRAYED, 0, 0, FORMAT, COMPONENTS>
+               Image<SampledType, 2, DEPTH, ARRAYED, 0, 2, FORMAT, COMPONENTS>
+             and 6 others
 note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>::query_size`
-   --> $SPIRV_STD_SRC/image.rs:938:15
-    |
-936 |     pub fn query_size<Size: ImageCoordinate<u32, DIM, ARRAYED> + Default>(&self) -> Size
-    |            ---------- required by a bound in this associated function
-937 |     where
-938 |         Self: HasQuerySize,
-    |               ^^^^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>::query_size`
+    --> $SPIRV_STD_SRC/image.rs:1011:15
+     |
+1009 |     pub fn query_size<Size: ImageCoordinate<u32, DIM, ARRAYED> + Default>(&self) -> Size
+     |            ---------- required by a bound in this associated function
+1010 |     where
+1011 |         Self: HasQuerySize,
+     |               ^^^^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>::query_size`
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/image/query/query_size_lod.rs b/tests/ui/image/query/query_size_lod.rs
@@ -1,5 +1,5 @@
 // build-pass
-// compile-flags: -C target-feature=+ImageQuery
+// compile-flags: -C target-feature=+ImageQuery,+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, arch};
diff --git a/tests/ui/image/query/query_size_lod_err.rs b/tests/ui/image/query/query_size_lod_err.rs
@@ -1,6 +1,6 @@
 // build-fail
 // normalize-stderr-test "\S*/crates/spirv-std/src/" -> "$$SPIRV_STD_SRC/"
-// compile-flags: -C target-feature=+ImageQuery
+// compile-flags: -C target-feature=+ImageQuery,+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::{Image, arch, spirv};
 
diff --git a/tests/ui/image/query/query_size_lod_err.stderr b/tests/ui/image/query/query_size_lod_err.stderr
@@ -1,22 +1,22 @@
 error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4>: HasQuerySizeLod` is not satisfied
-   --> $DIR/query_size_lod_err.rs:12:21
-    |
-12  |     *output = image.query_size_lod(0);
-    |                     ^^^^^^^^^^^^^^ the trait `HasQuerySizeLod` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0, 4>`
-    |
-    = help: the following other types implement trait `HasQuerySizeLod`:
-              Image<SampledType, 0, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
-              Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
-              Image<SampledType, 2, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
-              Image<SampledType, 3, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
+    --> $DIR/query_size_lod_err.rs:12:21
+     |
+12   |     *output = image.query_size_lod(0);
+     |                     ^^^^^^^^^^^^^^ the trait `HasQuerySizeLod` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0, 4>`
+     |
+     = help: the following other types implement trait `HasQuerySizeLod`:
+               Image<SampledType, 0, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
+               Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
+               Image<SampledType, 2, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
+               Image<SampledType, 3, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
 note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#7}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>::query_size_lod`
-   --> $SPIRV_STD_SRC/image.rs:982:15
-    |
-977 |     pub fn query_size_lod<Size: ImageCoordinate<u32, DIM, ARRAYED> + Default>(
-    |            -------------- required by a bound in this associated function
+    --> $SPIRV_STD_SRC/image.rs:1057:15
+     |
+1052 |     pub fn query_size_lod<Size: ImageCoordinate<u32, DIM, ARRAYED> + Default>(
+     |            -------------- required by a bound in this associated function
 ...
-982 |         Self: HasQuerySizeLod,
-    |               ^^^^^^^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#7}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>::query_size_lod`
+1057 |         Self: HasQuerySizeLod,
+     |               ^^^^^^^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#7}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>::query_size_lod`
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/image/read.rs b/tests/ui/image/read.rs
@@ -1,6 +1,6 @@
 // Test `OpImageRead`
 // build-pass
-// compile-flags: -C target-feature=+StorageImageReadWithoutFormat
+// compile-flags: -C target-feature=+StorageImageReadWithoutFormat,+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, arch};
diff --git a/tests/ui/image/read_subpass.rs b/tests/ui/image/read_subpass.rs
@@ -1,5 +1,5 @@
 // build-pass
-// compile-flags: -C target-feature=+InputAttachment
+// compile-flags: -C target-feature=+InputAttachment,+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, arch};
diff --git a/tests/ui/image/sample.rs b/tests/ui/image/sample.rs
@@ -1,5 +1,6 @@
 // Test `OpImageSampleImplicitLod`
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, Sampler, arch};
diff --git a/tests/ui/image/sample_bias.rs b/tests/ui/image/sample_bias.rs
@@ -1,5 +1,6 @@
 // Test `OpImageSampleImplicitLod` Bias
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, Sampler, arch};
diff --git a/tests/ui/image/sample_depth_reference/sample.rs b/tests/ui/image/sample_depth_reference/sample.rs
@@ -1,5 +1,6 @@
 // Test `OpImageSampleDrefImplicitLod`
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, Sampler, arch};
diff --git a/tests/ui/image/sample_depth_reference/sample_gradient.rs b/tests/ui/image/sample_depth_reference/sample_gradient.rs
@@ -1,5 +1,6 @@
 // Test `OpImageSampleDrefExplicitLod`
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, Sampler};
diff --git a/tests/ui/image/sample_depth_reference/sample_lod.rs b/tests/ui/image/sample_depth_reference/sample_lod.rs
@@ -1,5 +1,6 @@
 // Test `OpImageSampleDrefExplicitLod`
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, Sampler};
diff --git a/tests/ui/image/sample_depth_reference_with_project_coordinate/sample.rs b/tests/ui/image/sample_depth_reference_with_project_coordinate/sample.rs
@@ -1,5 +1,6 @@
 // Test `OpImageSampleProjDrefImplicitLod`
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, Sampler, arch};
diff --git a/tests/ui/image/sample_depth_reference_with_project_coordinate/sample_gradient.rs b/tests/ui/image/sample_depth_reference_with_project_coordinate/sample_gradient.rs
@@ -1,5 +1,6 @@
 // Test `OpImageSampleProjDrefExplicitLod`
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, Sampler};
diff --git a/tests/ui/image/sample_depth_reference_with_project_coordinate/sample_lod.rs b/tests/ui/image/sample_depth_reference_with_project_coordinate/sample_lod.rs
@@ -1,5 +1,6 @@
 // Test `OpImageSampleProjDrefExplicitLod`
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, Sampler};
diff --git a/tests/ui/image/sample_gradient.rs b/tests/ui/image/sample_gradient.rs
@@ -1,5 +1,6 @@
 // Test `OpImageSampleExplicitLod` Grad
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, Sampler, arch};
diff --git a/tests/ui/image/sample_lod.rs b/tests/ui/image/sample_lod.rs
@@ -1,5 +1,6 @@
 // Test `OpImageSampleExplicitLod` Lod
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, Sampler, arch, image::SampledImage};
diff --git a/tests/ui/image/sample_with_project_coordinate/sample.rs b/tests/ui/image/sample_with_project_coordinate/sample.rs
@@ -1,5 +1,6 @@
 // Test `OpImageSampleProjImplicitLod`
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, Sampler};
diff --git a/tests/ui/image/sample_with_project_coordinate/sample_gradient.rs b/tests/ui/image/sample_with_project_coordinate/sample_gradient.rs
@@ -1,5 +1,6 @@
 // Test `OpImageSampleProjExplicitLod`
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, Sampler, arch};
diff --git a/tests/ui/image/sample_with_project_coordinate/sample_lod.rs b/tests/ui/image/sample_with_project_coordinate/sample_lod.rs
@@ -1,5 +1,6 @@
 // Test `OpImageSampleProjExplicitLod`
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, Sampler, arch};
diff --git a/tests/ui/image/write.rs b/tests/ui/image/write.rs
@@ -1,6 +1,6 @@
 // Test `OpImageWrite`
 // build-pass
-// compile-flags: -C target-feature=+StorageImageWriteWithoutFormat
+// compile-flags: -C target-feature=+StorageImageWriteWithoutFormat,+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, arch};
diff --git a/tests/ui/storage_class/runtime_descriptor_array.rs b/tests/ui/storage_class/runtime_descriptor_array.rs
@@ -1,5 +1,5 @@
 // build-pass
-// compile-flags: -C target-feature=+RuntimeDescriptorArray,+ext:SPV_EXT_descriptor_indexing
+// compile-flags: -C target-feature=+RuntimeDescriptorArray,+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
 use spirv_std::{Image, RuntimeArray, Sampler};

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// build-pass`
	`2`	`+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing`
`2`	`3`
`3`	`4`	`use spirv_std::spirv;`
`4`	`5`	`use spirv_std::{Image, arch};`