use const ACCESS_QUALIFIER:u32 instead of singletons

Author: schell

crates/rustc_codegen_spirv/src/abi.rs

@@ -883,25 +883,17 @@ fn trans_intrinsic_type<'tcx>(
             let multisampled = const_int_value(cx, args.const_at(4))?;
             let sampled = const_int_value(cx, args.const_at(5))?;
             let image_format = const_int_value(cx, args.const_at(6))?;
-
-            let access_qualifier_ty = args.type_at(8);
-            let access_qualifier: Option<AccessQualifier> = if let TyKind::Adt(def, _) =
-                access_qualifier_ty.kind()
-            {
-                match cx.tcx.def_path_str(def.did()).as_str() {
-                    "spirv_std::image::ImageAccessReadOnly" => Some(AccessQualifier::ReadOnly),
-                    "spirv_std::image::ImageAccessWriteOnly" => Some(AccessQualifier::WriteOnly),
-                    "spirv_std::image::ImageAccessReadWrite" => Some(AccessQualifier::ReadWrite),
-                    "spirv_std::image::ImageAccessUnknown" => None,
-                    s => {
-                        return Err(cx
-                            .tcx
-                            .dcx()
-                            .err(format!("Invalid image access qualifier: '{s}'")));
-                    }
+            let access_qualifier = match const_int_value(cx, args.const_at(8))? {
+                0u32 => Some(AccessQualifier::ReadOnly),
+                1u32 => Some(AccessQualifier::WriteOnly),
+                2u32 => Some(AccessQualifier::ReadWrite),
+                3u32 => None,
+                n => {
+                    return Err(cx
+                        .tcx
+                        .dcx()
+                        .err(format!("Invalid value for Image access qualifier: {n}")));
                 }
-            } else {
-                return Err(cx.tcx.dcx().err("Invalid image access qualifier"));
             };
 
             let ty = SpirvType::Image {

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

@@ -413,7 +413,7 @@ impl quote::ToTokens for ImageType {
         let sampled = params::sampled_to_tokens(&self.sampled);
         let sampled_type = &self.sampled_type;
         let components = self.components;
-        let access = params::image_access_to_tokens(self.access);
+        let access = params::image_access_to_const_u32(self.access);
 
         tokens.append_all(quote::quote! {
             #crate_root::image::Image<
@@ -425,7 +425,7 @@ impl quote::ToTokens for ImageType {
                 { #crate_root::image::#sampled as u32 },
                 { #crate_root::image::#format as u32 },
                 { #components as u32 },
-                #crate_root::image::__private::#access
+                #access
             >
         });
     }
@@ -573,12 +573,12 @@ mod params {
         }
     }
 
-    pub fn image_access_to_tokens(access: Option<AccessQualifier>) -> proc_macro2::TokenStream {
+    pub fn image_access_to_const_u32(access: Option<AccessQualifier>) -> proc_macro2::TokenStream {
         match access {
-            Some(AccessQualifier::ReadOnly) => quote!(ImageAccessReadOnly),
-            Some(AccessQualifier::WriteOnly) => quote!(ImageAccessWriteOnly),
-            Some(AccessQualifier::ReadWrite) => quote!(ImageAccessReadWrite),
-            None => quote!(ImageAccessUnknown),
+            Some(AccessQualifier::ReadOnly) => quote!(AccessQualifier::ReadOnly as u32),
+            Some(AccessQualifier::WriteOnly) => quote!(AccessQualifier::WriteOnly as u32),
+            Some(AccessQualifier::ReadWrite) => quote!(AccessQualifier::ReadWrite as u32),
+            None => quote!(3),
         }
     }