[metal] Do not glob-import enum variants

The `metal` crate is currently unsound regarding unknown/future enum
variants, see gfx-rs/metal-rs#209 and
rust-lang/rfcs#3803.

`objc2-metal` fixes this by emitting C enums as a newtype + constants
for each variant, but that prevents us from importing the
variants/constants. So this commit converts to a pattern that works with
that in preparation for the migration.

Author: madsmtm

wgpu-hal/src/metal/adapter.rs

@@ -1082,144 +1082,144 @@ impl super::PrivateCapabilities {
 
     pub fn map_format(&self, format: wgt::TextureFormat) -> MTLPixelFormat {
         use wgt::TextureFormat as Tf;
-        use MTLPixelFormat::*;
+        use MTLPixelFormat as MTL;
         match format {
-            Tf::R8Unorm => R8Unorm,
-            Tf::R8Snorm => R8Snorm,
-            Tf::R8Uint => R8Uint,
-            Tf::R8Sint => R8Sint,
-            Tf::R16Uint => R16Uint,
-            Tf::R16Sint => R16Sint,
-            Tf::R16Unorm => R16Unorm,
-            Tf::R16Snorm => R16Snorm,
-            Tf::R16Float => R16Float,
-            Tf::Rg8Unorm => RG8Unorm,
-            Tf::Rg8Snorm => RG8Snorm,
-            Tf::Rg8Uint => RG8Uint,
-            Tf::Rg8Sint => RG8Sint,
-            Tf::Rg16Unorm => RG16Unorm,
-            Tf::Rg16Snorm => RG16Snorm,
-            Tf::R32Uint => R32Uint,
-            Tf::R32Sint => R32Sint,
-            Tf::R32Float => R32Float,
-            Tf::Rg16Uint => RG16Uint,
-            Tf::Rg16Sint => RG16Sint,
-            Tf::Rg16Float => RG16Float,
-            Tf::Rgba8Unorm => RGBA8Unorm,
-            Tf::Rgba8UnormSrgb => RGBA8Unorm_sRGB,
-            Tf::Bgra8UnormSrgb => BGRA8Unorm_sRGB,
-            Tf::Rgba8Snorm => RGBA8Snorm,
-            Tf::Bgra8Unorm => BGRA8Unorm,
-            Tf::Rgba8Uint => RGBA8Uint,
-            Tf::Rgba8Sint => RGBA8Sint,
-            Tf::Rgb10a2Uint => RGB10A2Uint,
-            Tf::Rgb10a2Unorm => RGB10A2Unorm,
-            Tf::Rg11b10Ufloat => RG11B10Float,
+            Tf::R8Unorm => MTL::R8Unorm,
+            Tf::R8Snorm => MTL::R8Snorm,
+            Tf::R8Uint => MTL::R8Uint,
+            Tf::R8Sint => MTL::R8Sint,
+            Tf::R16Uint => MTL::R16Uint,
+            Tf::R16Sint => MTL::R16Sint,
+            Tf::R16Unorm => MTL::R16Unorm,
+            Tf::R16Snorm => MTL::R16Snorm,
+            Tf::R16Float => MTL::R16Float,
+            Tf::Rg8Unorm => MTL::RG8Unorm,
+            Tf::Rg8Snorm => MTL::RG8Snorm,
+            Tf::Rg8Uint => MTL::RG8Uint,
+            Tf::Rg8Sint => MTL::RG8Sint,
+            Tf::Rg16Unorm => MTL::RG16Unorm,
+            Tf::Rg16Snorm => MTL::RG16Snorm,
+            Tf::R32Uint => MTL::R32Uint,
+            Tf::R32Sint => MTL::R32Sint,
+            Tf::R32Float => MTL::R32Float,
+            Tf::Rg16Uint => MTL::RG16Uint,
+            Tf::Rg16Sint => MTL::RG16Sint,
+            Tf::Rg16Float => MTL::RG16Float,
+            Tf::Rgba8Unorm => MTL::RGBA8Unorm,
+            Tf::Rgba8UnormSrgb => MTL::RGBA8Unorm_sRGB,
+            Tf::Bgra8UnormSrgb => MTL::BGRA8Unorm_sRGB,
+            Tf::Rgba8Snorm => MTL::RGBA8Snorm,
+            Tf::Bgra8Unorm => MTL::BGRA8Unorm,
+            Tf::Rgba8Uint => MTL::RGBA8Uint,
+            Tf::Rgba8Sint => MTL::RGBA8Sint,
+            Tf::Rgb10a2Uint => MTL::RGB10A2Uint,
+            Tf::Rgb10a2Unorm => MTL::RGB10A2Unorm,
+            Tf::Rg11b10Ufloat => MTL::RG11B10Float,
             // Ruint64 textures are emulated on metal
-            Tf::R64Uint => RG32Uint,
-            Tf::Rg32Uint => RG32Uint,
-            Tf::Rg32Sint => RG32Sint,
-            Tf::Rg32Float => RG32Float,
-            Tf::Rgba16Uint => RGBA16Uint,
-            Tf::Rgba16Sint => RGBA16Sint,
-            Tf::Rgba16Unorm => RGBA16Unorm,
-            Tf::Rgba16Snorm => RGBA16Snorm,
-            Tf::Rgba16Float => RGBA16Float,
-            Tf::Rgba32Uint => RGBA32Uint,
-            Tf::Rgba32Sint => RGBA32Sint,
-            Tf::Rgba32Float => RGBA32Float,
-            Tf::Stencil8 => Stencil8,
-            Tf::Depth16Unorm => Depth16Unorm,
-            Tf::Depth32Float => Depth32Float,
-            Tf::Depth32FloatStencil8 => Depth32Float_Stencil8,
+            Tf::R64Uint => MTL::RG32Uint,
+            Tf::Rg32Uint => MTL::RG32Uint,
+            Tf::Rg32Sint => MTL::RG32Sint,
+            Tf::Rg32Float => MTL::RG32Float,
+            Tf::Rgba16Uint => MTL::RGBA16Uint,
+            Tf::Rgba16Sint => MTL::RGBA16Sint,
+            Tf::Rgba16Unorm => MTL::RGBA16Unorm,
+            Tf::Rgba16Snorm => MTL::RGBA16Snorm,
+            Tf::Rgba16Float => MTL::RGBA16Float,
+            Tf::Rgba32Uint => MTL::RGBA32Uint,
+            Tf::Rgba32Sint => MTL::RGBA32Sint,
+            Tf::Rgba32Float => MTL::RGBA32Float,
+            Tf::Stencil8 => MTL::Stencil8,
+            Tf::Depth16Unorm => MTL::Depth16Unorm,
+            Tf::Depth32Float => MTL::Depth32Float,
+            Tf::Depth32FloatStencil8 => MTL::Depth32Float_Stencil8,
             Tf::Depth24Plus => {
                 if self.format_depth24_stencil8 {
-                    Depth24Unorm_Stencil8
+                    MTL::Depth24Unorm_Stencil8
                 } else {
-                    Depth32Float
+                    MTL::Depth32Float
                 }
             }
             Tf::Depth24PlusStencil8 => {
                 if self.format_depth24_stencil8 {
-                    Depth24Unorm_Stencil8
+                    MTL::Depth24Unorm_Stencil8
                 } else {
-                    Depth32Float_Stencil8
+                    MTL::Depth32Float_Stencil8
                 }
             }
             Tf::NV12 => unreachable!(),
-            Tf::Rgb9e5Ufloat => RGB9E5Float,
-            Tf::Bc1RgbaUnorm => BC1_RGBA,
-            Tf::Bc1RgbaUnormSrgb => BC1_RGBA_sRGB,
-            Tf::Bc2RgbaUnorm => BC2_RGBA,
-            Tf::Bc2RgbaUnormSrgb => BC2_RGBA_sRGB,
-            Tf::Bc3RgbaUnorm => BC3_RGBA,
-            Tf::Bc3RgbaUnormSrgb => BC3_RGBA_sRGB,
-            Tf::Bc4RUnorm => BC4_RUnorm,
-            Tf::Bc4RSnorm => BC4_RSnorm,
-            Tf::Bc5RgUnorm => BC5_RGUnorm,
-            Tf::Bc5RgSnorm => BC5_RGSnorm,
-            Tf::Bc6hRgbFloat => BC6H_RGBFloat,
-            Tf::Bc6hRgbUfloat => BC6H_RGBUfloat,
-            Tf::Bc7RgbaUnorm => BC7_RGBAUnorm,
-            Tf::Bc7RgbaUnormSrgb => BC7_RGBAUnorm_sRGB,
-            Tf::Etc2Rgb8Unorm => ETC2_RGB8,
-            Tf::Etc2Rgb8UnormSrgb => ETC2_RGB8_sRGB,
-            Tf::Etc2Rgb8A1Unorm => ETC2_RGB8A1,
-            Tf::Etc2Rgb8A1UnormSrgb => ETC2_RGB8A1_sRGB,
-            Tf::Etc2Rgba8Unorm => EAC_RGBA8,
-            Tf::Etc2Rgba8UnormSrgb => EAC_RGBA8_sRGB,
-            Tf::EacR11Unorm => EAC_R11Unorm,
-            Tf::EacR11Snorm => EAC_R11Snorm,
-            Tf::EacRg11Unorm => EAC_RG11Unorm,
-            Tf::EacRg11Snorm => EAC_RG11Snorm,
+            Tf::Rgb9e5Ufloat => MTL::RGB9E5Float,
+            Tf::Bc1RgbaUnorm => MTL::BC1_RGBA,
+            Tf::Bc1RgbaUnormSrgb => MTL::BC1_RGBA_sRGB,
+            Tf::Bc2RgbaUnorm => MTL::BC2_RGBA,
+            Tf::Bc2RgbaUnormSrgb => MTL::BC2_RGBA_sRGB,
+            Tf::Bc3RgbaUnorm => MTL::BC3_RGBA,
+            Tf::Bc3RgbaUnormSrgb => MTL::BC3_RGBA_sRGB,
+            Tf::Bc4RUnorm => MTL::BC4_RUnorm,
+            Tf::Bc4RSnorm => MTL::BC4_RSnorm,
+            Tf::Bc5RgUnorm => MTL::BC5_RGUnorm,
+            Tf::Bc5RgSnorm => MTL::BC5_RGSnorm,
+            Tf::Bc6hRgbFloat => MTL::BC6H_RGBFloat,
+            Tf::Bc6hRgbUfloat => MTL::BC6H_RGBUfloat,
+            Tf::Bc7RgbaUnorm => MTL::BC7_RGBAUnorm,
+            Tf::Bc7RgbaUnormSrgb => MTL::BC7_RGBAUnorm_sRGB,
+            Tf::Etc2Rgb8Unorm => MTL::ETC2_RGB8,
+            Tf::Etc2Rgb8UnormSrgb => MTL::ETC2_RGB8_sRGB,
+            Tf::Etc2Rgb8A1Unorm => MTL::ETC2_RGB8A1,
+            Tf::Etc2Rgb8A1UnormSrgb => MTL::ETC2_RGB8A1_sRGB,
+            Tf::Etc2Rgba8Unorm => MTL::EAC_RGBA8,
+            Tf::Etc2Rgba8UnormSrgb => MTL::EAC_RGBA8_sRGB,
+            Tf::EacR11Unorm => MTL::EAC_R11Unorm,
+            Tf::EacR11Snorm => MTL::EAC_R11Snorm,
+            Tf::EacRg11Unorm => MTL::EAC_RG11Unorm,
+            Tf::EacRg11Snorm => MTL::EAC_RG11Snorm,
             Tf::Astc { block, channel } => match channel {
                 AstcChannel::Unorm => match block {
-                    AstcBlock::B4x4 => ASTC_4x4_LDR,
-                    AstcBlock::B5x4 => ASTC_5x4_LDR,
-                    AstcBlock::B5x5 => ASTC_5x5_LDR,
-                    AstcBlock::B6x5 => ASTC_6x5_LDR,
-                    AstcBlock::B6x6 => ASTC_6x6_LDR,
-                    AstcBlock::B8x5 => ASTC_8x5_LDR,
-                    AstcBlock::B8x6 => ASTC_8x6_LDR,
-                    AstcBlock::B8x8 => ASTC_8x8_LDR,
-                    AstcBlock::B10x5 => ASTC_10x5_LDR,
-                    AstcBlock::B10x6 => ASTC_10x6_LDR,
-                    AstcBlock::B10x8 => ASTC_10x8_LDR,
-                    AstcBlock::B10x10 => ASTC_10x10_LDR,
-                    AstcBlock::B12x10 => ASTC_12x10_LDR,
-                    AstcBlock::B12x12 => ASTC_12x12_LDR,
+                    AstcBlock::B4x4 => MTL::ASTC_4x4_LDR,
+                    AstcBlock::B5x4 => MTL::ASTC_5x4_LDR,
+                    AstcBlock::B5x5 => MTL::ASTC_5x5_LDR,
+                    AstcBlock::B6x5 => MTL::ASTC_6x5_LDR,
+                    AstcBlock::B6x6 => MTL::ASTC_6x6_LDR,
+                    AstcBlock::B8x5 => MTL::ASTC_8x5_LDR,
+                    AstcBlock::B8x6 => MTL::ASTC_8x6_LDR,
+                    AstcBlock::B8x8 => MTL::ASTC_8x8_LDR,
+                    AstcBlock::B10x5 => MTL::ASTC_10x5_LDR,
+                    AstcBlock::B10x6 => MTL::ASTC_10x6_LDR,
+                    AstcBlock::B10x8 => MTL::ASTC_10x8_LDR,
+                    AstcBlock::B10x10 => MTL::ASTC_10x10_LDR,
+                    AstcBlock::B12x10 => MTL::ASTC_12x10_LDR,
+                    AstcBlock::B12x12 => MTL::ASTC_12x12_LDR,
                 },
                 AstcChannel::UnormSrgb => match block {
-                    AstcBlock::B4x4 => ASTC_4x4_sRGB,
-                    AstcBlock::B5x4 => ASTC_5x4_sRGB,
-                    AstcBlock::B5x5 => ASTC_5x5_sRGB,
-                    AstcBlock::B6x5 => ASTC_6x5_sRGB,
-                    AstcBlock::B6x6 => ASTC_6x6_sRGB,
-                    AstcBlock::B8x5 => ASTC_8x5_sRGB,
-                    AstcBlock::B8x6 => ASTC_8x6_sRGB,
-                    AstcBlock::B8x8 => ASTC_8x8_sRGB,
-                    AstcBlock::B10x5 => ASTC_10x5_sRGB,
-                    AstcBlock::B10x6 => ASTC_10x6_sRGB,
-                    AstcBlock::B10x8 => ASTC_10x8_sRGB,
-                    AstcBlock::B10x10 => ASTC_10x10_sRGB,
-                    AstcBlock::B12x10 => ASTC_12x10_sRGB,
-                    AstcBlock::B12x12 => ASTC_12x12_sRGB,
+                    AstcBlock::B4x4 => MTL::ASTC_4x4_sRGB,
+                    AstcBlock::B5x4 => MTL::ASTC_5x4_sRGB,
+                    AstcBlock::B5x5 => MTL::ASTC_5x5_sRGB,
+                    AstcBlock::B6x5 => MTL::ASTC_6x5_sRGB,
+                    AstcBlock::B6x6 => MTL::ASTC_6x6_sRGB,
+                    AstcBlock::B8x5 => MTL::ASTC_8x5_sRGB,
+                    AstcBlock::B8x6 => MTL::ASTC_8x6_sRGB,
+                    AstcBlock::B8x8 => MTL::ASTC_8x8_sRGB,
+                    AstcBlock::B10x5 => MTL::ASTC_10x5_sRGB,
+                    AstcBlock::B10x6 => MTL::ASTC_10x6_sRGB,
+                    AstcBlock::B10x8 => MTL::ASTC_10x8_sRGB,
+                    AstcBlock::B10x10 => MTL::ASTC_10x10_sRGB,
+                    AstcBlock::B12x10 => MTL::ASTC_12x10_sRGB,
+                    AstcBlock::B12x12 => MTL::ASTC_12x12_sRGB,
                 },
                 AstcChannel::Hdr => match block {
-                    AstcBlock::B4x4 => ASTC_4x4_HDR,
-                    AstcBlock::B5x4 => ASTC_5x4_HDR,
-                    AstcBlock::B5x5 => ASTC_5x5_HDR,
-                    AstcBlock::B6x5 => ASTC_6x5_HDR,
-                    AstcBlock::B6x6 => ASTC_6x6_HDR,
-                    AstcBlock::B8x5 => ASTC_8x5_HDR,
-                    AstcBlock::B8x6 => ASTC_8x6_HDR,
-                    AstcBlock::B8x8 => ASTC_8x8_HDR,
-                    AstcBlock::B10x5 => ASTC_10x5_HDR,
-                    AstcBlock::B10x6 => ASTC_10x6_HDR,
-                    AstcBlock::B10x8 => ASTC_10x8_HDR,
-                    AstcBlock::B10x10 => ASTC_10x10_HDR,
-                    AstcBlock::B12x10 => ASTC_12x10_HDR,
-                    AstcBlock::B12x12 => ASTC_12x12_HDR,
+                    AstcBlock::B4x4 => MTL::ASTC_4x4_HDR,
+                    AstcBlock::B5x4 => MTL::ASTC_5x4_HDR,
+                    AstcBlock::B5x5 => MTL::ASTC_5x5_HDR,
+                    AstcBlock::B6x5 => MTL::ASTC_6x5_HDR,
+                    AstcBlock::B6x6 => MTL::ASTC_6x6_HDR,
+                    AstcBlock::B8x5 => MTL::ASTC_8x5_HDR,
+                    AstcBlock::B8x6 => MTL::ASTC_8x6_HDR,
+                    AstcBlock::B8x8 => MTL::ASTC_8x8_HDR,
+                    AstcBlock::B10x5 => MTL::ASTC_10x5_HDR,
+                    AstcBlock::B10x6 => MTL::ASTC_10x6_HDR,
+                    AstcBlock::B10x8 => MTL::ASTC_10x8_HDR,
+                    AstcBlock::B10x10 => MTL::ASTC_10x10_HDR,
+                    AstcBlock::B12x10 => MTL::ASTC_12x10_HDR,
+                    AstcBlock::B12x12 => MTL::ASTC_12x12_HDR,
                 },
             },
         }
@@ -1232,18 +1232,18 @@ impl super::PrivateCapabilities {
     ) -> MTLPixelFormat {
         use crate::FormatAspects as Fa;
         use wgt::TextureFormat as Tf;
-        use MTLPixelFormat::*;
+        use MTLPixelFormat as MTL;
         match (format, aspects) {
             // map combined depth-stencil format to their stencil-only format
             // see https://developer.apple.com/library/archive/documentation/Miscellaneous/Conceptual/MetalProgrammingGuide/WhatsNewiniOS10tvOS10andOSX1012/WhatsNewiniOS10tvOS10andOSX1012.html#//apple_ref/doc/uid/TP40014221-CH14-DontLinkElementID_77
             (Tf::Depth24PlusStencil8, Fa::STENCIL) => {
                 if self.format_depth24_stencil8 {
-                    X24_Stencil8
+                    MTL::X24_Stencil8
                 } else {
-                    X32_Stencil8
+                    MTL::X32_Stencil8
                 }
             }
-            (Tf::Depth32FloatStencil8, Fa::STENCIL) => X32_Stencil8,
+            (Tf::Depth32FloatStencil8, Fa::STENCIL) => MTL::X32_Stencil8,
 
             _ => self.map_format(format),
         }