Add other cases to tests

Author: LegNeato

crates/spirv-std/src/image/params.rs

@@ -197,7 +197,7 @@ impl<V: Vector<I, 3>, I: Integer> ImageCoordinateSubpassData<I, { Arrayed::True
 
 /// Marker trait for query size results based on image dimension and arraying.
 ///
-/// Unlike `ImageCoordinate`, this trait represents the SPIR-V size query results:
+/// This trait represents the SPIR-V size query results:
 /// - 1D images return a scalar
 /// - 2D/Cube/Rect images return 2 components (Cube returns face width/height)
 /// - 3D images return 3 components

tests/compiletests/ui/image/query/rect_image_query_size.rs

@@ -0,0 +1,20 @@
+// build-pass
+// compile-flags: -C target-feature=+ImageQuery,+SampledRect
+
+use spirv_std::spirv;
+use spirv_std::{Image, arch};
+
+#[spirv(fragment)]
+pub fn main(
+    #[spirv(descriptor_set = 0, binding = 0)] rect_storage: &Image!(rect, type=f32, sampled=false),
+    #[spirv(descriptor_set = 1, binding = 1)] rect_storage_array: &Image!(rect, type=f32, sampled=false, arrayed),
+    output: &mut glam::UVec3,
+) {
+    // Rect images only support query_size (not query_size_lod)
+    let rect_size: glam::UVec2 = rect_storage.query_size();
+
+    // Arrayed rect images return 3D size (width, height, array_layers)
+    let rect_array_size: glam::UVec3 = rect_storage_array.query_size();
+
+    *output = glam::UVec3::new(rect_size.x, rect_size.y, rect_array_size.z);
+}

tests/compiletests/ui/image/query/sampled_image_multisampled_query_size.rs

@@ -1,4 +1,3 @@
-// Test `OpImageQuerySize` on multisampled `SampledImage`
 // build-pass
 // compile-flags: -C target-feature=+ImageQuery
 

tests/compiletests/ui/image/query/sampled_image_query_size.rs

@@ -1,27 +1,53 @@
-// Test `OpImageQuerySizeLod` on `SampledImage`
 // build-pass
-// compile-flags: -C target-feature=+ImageQuery
+// compile-flags: -C target-feature=+ImageQuery,+Sampled1D
 
 use spirv_std::spirv;
 use spirv_std::{Image, arch, image::SampledImage};
 
 #[spirv(fragment)]
 pub fn main(
-    #[spirv(descriptor_set = 0, binding = 0)] sampled_image2d: &SampledImage<
+    #[spirv(descriptor_set = 0, binding = 0)] sampled_image1d: &SampledImage<
+        Image!(1D, type=f32, sampled),
+    >,
+    #[spirv(descriptor_set = 1, binding = 1)] sampled_image1d_array: &SampledImage<
+        Image!(1D, type=f32, arrayed, sampled),
+    >,
+    #[spirv(descriptor_set = 2, binding = 2)] sampled_image2d: &SampledImage<
         Image!(2D, type=f32, sampled),
     >,
-    #[spirv(descriptor_set = 1, binding = 1)] sampled_image2d_array: &SampledImage<
+    #[spirv(descriptor_set = 3, binding = 3)] sampled_image2d_array: &SampledImage<
         Image!(2D, type=f32, arrayed, sampled),
     >,
-    #[spirv(descriptor_set = 2, binding = 2)] sampled_image3d: &SampledImage<
+    #[spirv(descriptor_set = 4, binding = 4)] sampled_image3d: &SampledImage<
         Image!(3D, type=f32, sampled),
     >,
-    output: &mut glam::UVec3,
+    #[spirv(descriptor_set = 5, binding = 5)] sampled_image3d_array: &SampledImage<
+        Image!(3D, type=f32, arrayed, sampled),
+    >,
+    output: &mut glam::UVec4,
 ) {
-    // For sampled images, we need to use query_size_lod
+    // 1D images return scalar
+    let size_1d: u32 = sampled_image1d.query_size_lod(0);
+
+    // 1D arrayed images return 2 components (width, array_layers)
+    let size_1d_array: glam::UVec2 = sampled_image1d_array.query_size_lod(0);
+
+    // 2D images return 2 components
     let size_2d: glam::UVec2 = sampled_image2d.query_size_lod(0);
+
+    // 2D arrayed images return 3 components
     let size_2d_array: glam::UVec3 = sampled_image2d_array.query_size_lod(0);
+
+    // 3D images return 3 components
     let size_3d: glam::UVec3 = sampled_image3d.query_size_lod(0);
 
-    *output = glam::UVec3::new(size_2d.x, size_2d_array.y, size_3d.z);
+    // 3D arrayed images return 4 components (width, height, depth, array_layers)
+    let size_3d_array: glam::UVec4 = sampled_image3d_array.query_size_lod(0);
+
+    *output = glam::UVec4::new(
+        size_1d,
+        size_1d_array.y,
+        size_2d.x + size_3d.z,
+        size_3d_array.w,
+    );
 }

tests/compiletests/ui/image/query/sampled_image_rect_query_size_lod_err.rs

@@ -0,0 +1,16 @@
+// build-fail
+// normalize-stderr-test "\S*/crates/spirv-std/src/" -> "$SPIRV_STD_SRC/"
+// compile-flags: -C target-feature=+ImageQuery,+SampledRect
+
+use spirv_std::{Image, arch, spirv, image::SampledImage};
+
+#[spirv(fragment)]
+pub fn main(
+    #[spirv(descriptor_set = 0, binding = 0)] rect_sampled: &SampledImage<
+        Image!(rect, type=f32, sampled),
+    >,
+    output: &mut glam::UVec2,
+) {
+    // This should fail because rect images don't support query_size_lod
+    *output = rect_sampled.query_size_lod(0);
+}

tests/compiletests/ui/image/query/sampled_image_rect_query_size_lod_err.stderr

@@ -0,0 +1,23 @@
+error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4>: HasQuerySizeLod` is not satisfied
+    --> $DIR/sampled_image_rect_query_size_lod_err.rs:15:28
+     |
+15   |     *output = rect_sampled.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 `SampledImage::<Image<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#9}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>>::query_size_lod`
+    --> /image.rs:1138:12
+     |
+1124 |     pub fn query_size_lod<Size: ImageSizeQuery<u32, DIM, ARRAYED> + Default>(
+     |            -------------- required by a bound in this associated function
+...
+1138 |         >: HasQuerySizeLod,
+     |            ^^^^^^^^^^^^^^^ required by this bound in `SampledImage::<Image<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#9}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>>::query_size_lod`
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0277`.

tests/compiletests/ui/image/query/storage_image_query_size.rs

@@ -0,0 +1,28 @@
+// build-pass
+// compile-flags: -C target-feature=+ImageQuery,+Sampled1D,+SampledBuffer
+
+use spirv_std::spirv;
+use spirv_std::{Image, arch};
+
+#[spirv(fragment)]
+pub fn main(
+    #[spirv(descriptor_set = 0, binding = 0)] buffer_image: &Image!(buffer, type=f32, sampled=false),
+    #[spirv(descriptor_set = 1, binding = 1)] storage_1d: &Image!(1D, type=f32, sampled=false),
+    #[spirv(descriptor_set = 2, binding = 2)] storage_1d_array: &Image!(1D, type=f32, sampled=false, arrayed),
+    #[spirv(descriptor_set = 3, binding = 3)] storage_3d_array: &Image!(3D, type=f32, sampled=false, arrayed),
+    output: &mut glam::UVec4,
+) {
+    // Buffer images return scalar (number of texels)
+    let buffer_size: u32 = buffer_image.query_size();
+
+    // 1D storage images return scalar
+    let size_1d: u32 = storage_1d.query_size();
+
+    // 1D arrayed storage images return 2 components
+    let size_1d_array: glam::UVec2 = storage_1d_array.query_size();
+
+    // 3D arrayed storage images return 4 components
+    let size_3d_array: glam::UVec4 = storage_3d_array.query_size();
+
+    *output = glam::UVec4::new(buffer_size, size_1d, size_1d_array.y, size_3d_array.w);
+}