Add ImageSizeQuery

Without this cubemaps were broken...we were returning UVec3 but spirv
validation required UVec2.

Author: LegNeato

crates/spirv-std/src/image.rs

@@ -10,7 +10,7 @@ mod params;
 /// Contains extra image operands
 pub mod sample_with;
 
-pub use self::params::{ImageCoordinate, ImageCoordinateSubpassData, SampleType};
+pub use self::params::{ImageCoordinate, ImageCoordinateSubpassData, ImageSizeQuery, SampleType};
 pub use crate::macros::Image;
 pub use spirv_std_types::image_params::{
     AccessQualifier, Arrayed, Dimensionality, ImageDepth, ImageFormat, Multisampled, Sampled,
@@ -933,7 +933,7 @@ impl<
     /// Query the dimensions of Image, with no level of detail.
     #[crate::macros::gpu_only]
     #[doc(alias = "OpImageQuerySize")]
-    pub fn query_size<Size: ImageCoordinate<u32, DIM, ARRAYED> + Default>(&self) -> Size
+    pub fn query_size<Size: ImageSizeQuery<u32, DIM, ARRAYED> + Default>(&self) -> Size
     where
         Self: HasQuerySize,
     {
@@ -971,10 +971,10 @@ impl<
         COMPONENTS,
     >
 {
-    /// Query the dimensions of Image, with no level of detail.
+    /// Query the dimensions of Image at a specific level of detail.
     #[crate::macros::gpu_only]
     #[doc(alias = "OpImageQuerySizeLod")]
-    pub fn query_size_lod<Size: ImageCoordinate<u32, DIM, ARRAYED> + Default>(
+    pub fn query_size_lod<Size: ImageSizeQuery<u32, DIM, ARRAYED> + Default>(
         &self,
         lod: u32,
     ) -> Size
@@ -1121,7 +1121,7 @@ impl<
     /// Query the dimensions of the image at the specified level of detail.
     #[crate::macros::gpu_only]
     #[doc(alias = "OpImageQuerySizeLod")]
-    pub fn query_size_lod<Size: ImageCoordinate<u32, DIM, ARRAYED> + Default>(
+    pub fn query_size_lod<Size: ImageSizeQuery<u32, DIM, ARRAYED> + Default>(
         &self,
         lod: u32,
     ) -> Size
@@ -1179,7 +1179,7 @@ impl<
     /// Available only for multisampled images.
     #[crate::macros::gpu_only]
     #[doc(alias = "OpImageQuerySize")]
-    pub fn query_size<Size: ImageCoordinate<u32, DIM, ARRAYED> + Default>(&self) -> Size
+    pub fn query_size<Size: ImageSizeQuery<u32, DIM, ARRAYED> + Default>(&self) -> Size
     where
         Image<
             SampledType,

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

@@ -194,3 +194,68 @@ impl<V: Vector<S, 4>, S: Scalar>
 pub trait ImageCoordinateSubpassData<T, const ARRAYED: u32> {}
 impl<V: Vector<I, 2>, I: Integer> ImageCoordinateSubpassData<I, { Arrayed::False as u32 }> for V {}
 impl<V: Vector<I, 3>, I: Integer> ImageCoordinateSubpassData<I, { Arrayed::True as u32 }> for V {}
+
+/// Marker trait for query size results based on image dimension and arraying.
+///
+/// Unlike `ImageCoordinate`, 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
+/// - Arrayed images add one component for the array size
+pub trait ImageSizeQuery<T, const DIM: u32, const ARRAYED: u32> {}
+
+// 1D images
+impl<T: Scalar> ImageSizeQuery<T, { Dimensionality::OneD as u32 }, { Arrayed::False as u32 }>
+    for T
+{
+}
+impl<V: Vector<T, 2>, T: Scalar>
+    ImageSizeQuery<T, { Dimensionality::OneD as u32 }, { Arrayed::True as u32 }> for V
+{
+}
+
+// 2D images
+impl<V: Vector<T, 2>, T: Scalar>
+    ImageSizeQuery<T, { Dimensionality::TwoD as u32 }, { Arrayed::False as u32 }> for V
+{
+}
+impl<V: Vector<T, 3>, T: Scalar>
+    ImageSizeQuery<T, { Dimensionality::TwoD as u32 }, { Arrayed::True as u32 }> for V
+{
+}
+
+// 3D images
+impl<V: Vector<T, 3>, T: Scalar>
+    ImageSizeQuery<T, { Dimensionality::ThreeD as u32 }, { Arrayed::False as u32 }> for V
+{
+}
+impl<V: Vector<T, 4>, T: Scalar>
+    ImageSizeQuery<T, { Dimensionality::ThreeD as u32 }, { Arrayed::True as u32 }> for V
+{
+}
+
+// Cube images - returns 2D size (width/height of face)
+impl<V: Vector<T, 2>, T: Scalar>
+    ImageSizeQuery<T, { Dimensionality::Cube as u32 }, { Arrayed::False as u32 }> for V
+{
+}
+impl<V: Vector<T, 3>, T: Scalar>
+    ImageSizeQuery<T, { Dimensionality::Cube as u32 }, { Arrayed::True as u32 }> for V
+{
+}
+
+// Rect images
+impl<V: Vector<T, 2>, T: Scalar>
+    ImageSizeQuery<T, { Dimensionality::Rect as u32 }, { Arrayed::False as u32 }> for V
+{
+}
+impl<V: Vector<T, 3>, T: Scalar>
+    ImageSizeQuery<T, { Dimensionality::Rect as u32 }, { Arrayed::True as u32 }> for V
+{
+}
+
+// Buffer images
+impl<T: Scalar> ImageSizeQuery<T, { Dimensionality::Buffer as u32 }, { Arrayed::False as u32 }>
+    for T
+{
+}

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

@@ -0,0 +1,24 @@
+// build-pass
+// compile-flags: -C target-feature=+ImageQuery
+
+use spirv_std::spirv;
+use spirv_std::{Image, arch, image::Cubemap};
+
+#[spirv(fragment)]
+pub fn main(
+    #[spirv(descriptor_set = 0, binding = 0)] cubemap: &Cubemap,
+    #[spirv(descriptor_set = 1, binding = 1)] cubemap_array: &Image!(cube, type=f32, sampled, arrayed),
+    #[spirv(descriptor_set = 2, binding = 2)] storage_cubemap: &Image!(cube, type=f32, sampled=false),
+    output: &mut glam::UVec3,
+) {
+    // Cubemaps return 2D size (width, height of one face)
+    let size: glam::UVec2 = cubemap.query_size_lod(0);
+
+    // Arrayed cubemaps return 3D size (width, height, array_layers)
+    let size_array: glam::UVec3 = cubemap_array.query_size_lod(0);
+
+    // Storage cubemaps can use query_size directly
+    let storage_size: glam::UVec2 = storage_cubemap.query_size();
+
+    *output = glam::UVec3::new(size.x, size_array.z, storage_size.x);
+}

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

@@ -17,7 +17,7 @@ error[E0277]: the trait bound `Image<f32, 1, 2, 0, 0, 1, 0, 4>: HasQuerySize` is
 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
+936 |     pub fn query_size<Size: ImageSizeQuery<u32, DIM, ARRAYED> + Default>(&self) -> Size
     |            ---------- required by a bound in this associated function
 937 |     where
 938 |         Self: HasQuerySize,

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

@@ -12,7 +12,7 @@ error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4>: HasQuerySizeLod`
 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>(
+977 |     pub fn query_size_lod<Size: ImageSizeQuery<u32, DIM, ARRAYED> + Default>(
     |            -------------- required by a bound in this associated function
 ...
 982 |         Self: HasQuerySizeLod,