mtl: Map more vertex formats

Author: grovesNL

Diff for: src/backend/metal/Cargo.toml

@@ -22,7 +22,7 @@ name = "gfx_backend_metal"
 gfx-hal = { path = "../../hal", version = "0.1" }
 log = "0.4"
 winit = { version = "0.12", optional = true }
-metal-rs = "0.8.1"
+metal-rs = "0.8.3"
 foreign-types = "0.3"
 objc = "0.2"
 block = "0.1"

Diff for: src/backend/metal/src/conversions.rs

@@ -189,11 +189,58 @@ pub fn map_blend_op(operation: &pso::BlendOp) -> (MTLBlendOperation, MTLBlendFac
 
 
 pub fn map_vertex_format(format: Format) -> Option<MTLVertexFormat> {
-    // TODO: more formats
-    Some(match format {
-        Format::Rgba32Float => MTLVertexFormat::Float4,
-        Format::Rgb32Float => MTLVertexFormat::Float3,
-        Format::Rg32Float => MTLVertexFormat::Float2,
+    use metal::MTLVertexFormat::*;
+    use hal::format::Format as f;
+    Some(match format {  
+        f::R8Unorm     => UCharNormalized,
+        f::R8Inorm     => CharNormalized,
+        f::R8Uint      => UChar,
+        f::R8Int       => Char,
+        f::Rg8Unorm    => UChar2Normalized,
+        f::Rg8Inorm    => Char2Normalized,
+        f::Rg8Uint     => UChar2,
+        f::Rg8Int      => Char2,
+        f::Rgb8Unorm   => UChar3Normalized,
+        f::Rgb8Inorm   => Char3Normalized,
+        f::Rgb8Uint    => UChar3,
+        f::Rgb8Int     => Char3,
+        f::Rgba8Unorm  => UChar4Normalized,
+        f::Rgba8Inorm  => Char4Normalized,
+        f::Rgba8Uint   => UChar4,
+        f::Rgba8Int    => Char4,
+        f::Bgra8Unorm  => UChar4Normalized_BGRA,
+        f::R16Unorm    => UShortNormalized,
+        f::R16Inorm    => ShortNormalized,
+        f::R16Uint     => UShort,
+        f::R16Int      => Short,
+        f::R16Float    => Half,
+        f::Rg16Unorm   => UShort2Normalized,
+        f::Rg16Inorm   => Short2Normalized,
+        f::Rg16Uint    => UShort2,
+        f::Rg16Int     => Short2,
+        f::Rg16Float   => Half2,
+        f::Rgb16Unorm  => UShort3Normalized,
+        f::Rgb16Inorm  => Short3Normalized,
+        f::Rgb16Uint   => UShort3,
+        f::Rgb16Int    => Short3,
+        f::Rgb16Float  => Half3,
+        f::Rgba16Unorm => UShort4Normalized,
+        f::Rgba16Inorm => Short4Normalized,
+        f::Rgba16Uint  => UShort4,
+        f::Rgba16Int   => Short4,
+        f::Rgba16Float => Half4,
+        f::R32Uint     => UInt,
+        f::R32Int      => Int,
+        f::R32Float    => Float,
+        f::Rg32Uint    => UInt2,
+        f::Rg32Int     => Int2,
+        f::Rg32Float   => Float2,
+        f::Rgb32Uint   => UInt3,
+        f::Rgb32Int    => Int3,
+        f::Rgb32Float  => Float3,
+        f::Rgba32Uint  => UInt4,
+        f::Rgba32Int   => Int4,
+        f::Rgba32Float => Float4,
         _ => return None,
     })
 }