Merge #86

86: Add vertex formats r=kvark a=unconed

Add the vertex formats from: https://github.com/gpuweb/gpuweb/blob/master/design/sketch.webidl



Co-authored-by: Steven Wittens <[email protected]>

Author: bors[bot]

gfx-examples/src/cube.rs

@@ -308,12 +308,12 @@ impl framework::Example for Example {
                     attributes: &[
                         wgpu::VertexAttributeDescriptor {
                             attribute_index: 0,
-                            format: wgpu::VertexFormat::FloatR32G32B32A32,
+                            format: wgpu::VertexFormat::Float4,
                             offset: 0,
                         },
                         wgpu::VertexAttributeDescriptor {
                             attribute_index: 1,
-                            format: wgpu::VertexFormat::FloatR32G32,
+                            format: wgpu::VertexFormat::Float2,
                             offset: 4 * 4,
                         },
                     ],

gfx-examples/src/shadow.rs

@@ -389,12 +389,12 @@ impl framework::Example for Example {
             attributes: &[
                 wgpu::VertexAttributeDescriptor {
                     attribute_index: 0,
-                    format: wgpu::VertexFormat::IntR8G8B8A8,
+                    format: wgpu::VertexFormat::Char4,
                     offset: 0,
                 },
                 wgpu::VertexAttributeDescriptor {
                     attribute_index: 1,
-                    format: wgpu::VertexFormat::IntR8G8B8A8,
+                    format: wgpu::VertexFormat::Char4,
                     offset: 4 * 1,
                 },
             ],

wgpu-bindings/wgpu.h

@@ -187,11 +187,55 @@ typedef enum {
 } WGPUTextureViewDimension;
 
 typedef enum {
-  WGPUVertexFormat_FloatR32G32B32A32 = 0,
-  WGPUVertexFormat_FloatR32G32B32 = 1,
-  WGPUVertexFormat_FloatR32G32 = 2,
-  WGPUVertexFormat_FloatR32 = 3,
-  WGPUVertexFormat_IntR8G8B8A8 = 4,
+  WGPUVertexFormat_Uchar = 0,
+  WGPUVertexFormat_Uchar2 = 1,
+  WGPUVertexFormat_Uchar3 = 2,
+  WGPUVertexFormat_Uchar4 = 3,
+  WGPUVertexFormat_Char = 4,
+  WGPUVertexFormat_Char2 = 5,
+  WGPUVertexFormat_Char3 = 6,
+  WGPUVertexFormat_Char4 = 7,
+  WGPUVertexFormat_UcharNorm = 8,
+  WGPUVertexFormat_Uchar2Norm = 9,
+  WGPUVertexFormat_Uchar3Norm = 10,
+  WGPUVertexFormat_Uchar4Norm = 11,
+  WGPUVertexFormat_Uchar4NormBgra = 12,
+  WGPUVertexFormat_CharNorm = 13,
+  WGPUVertexFormat_Char2Norm = 14,
+  WGPUVertexFormat_Char3Norm = 15,
+  WGPUVertexFormat_Char4Norm = 16,
+  WGPUVertexFormat_Ushort = 17,
+  WGPUVertexFormat_Ushort2 = 18,
+  WGPUVertexFormat_Ushort3 = 19,
+  WGPUVertexFormat_Ushort4 = 20,
+  WGPUVertexFormat_Short = 21,
+  WGPUVertexFormat_Short2 = 22,
+  WGPUVertexFormat_Short3 = 23,
+  WGPUVertexFormat_Short4 = 24,
+  WGPUVertexFormat_UshortNorm = 25,
+  WGPUVertexFormat_Ushort2Norm = 26,
+  WGPUVertexFormat_Ushort3Norm = 27,
+  WGPUVertexFormat_Ushort4Norm = 28,
+  WGPUVertexFormat_ShortNorm = 29,
+  WGPUVertexFormat_Short2Norm = 30,
+  WGPUVertexFormat_Short3Norm = 31,
+  WGPUVertexFormat_Short4Norm = 32,
+  WGPUVertexFormat_Half = 33,
+  WGPUVertexFormat_Half2 = 34,
+  WGPUVertexFormat_Half3 = 35,
+  WGPUVertexFormat_Half4 = 36,
+  WGPUVertexFormat_Float = 37,
+  WGPUVertexFormat_Float2 = 38,
+  WGPUVertexFormat_Float3 = 39,
+  WGPUVertexFormat_Float4 = 40,
+  WGPUVertexFormat_Uint = 41,
+  WGPUVertexFormat_Uint2 = 42,
+  WGPUVertexFormat_Uint3 = 43,
+  WGPUVertexFormat_Uint4 = 44,
+  WGPUVertexFormat_Int = 45,
+  WGPUVertexFormat_Int2 = 46,
+  WGPUVertexFormat_Int3 = 47,
+  WGPUVertexFormat_Int4 = 48,
 } WGPUVertexFormat;
 
 typedef struct WGPUBufferMapAsyncStatus WGPUBufferMapAsyncStatus;

wgpu-native/src/conv.rs

@@ -358,11 +358,55 @@ pub fn map_vertex_format(vertex_format: pipeline::VertexFormat) -> hal::format::
     use hal::format::Format as H;
     use crate::pipeline::VertexFormat::*;
     match vertex_format {
-        FloatR32G32B32A32 => H::Rgba32Float,
-        FloatR32G32B32 => H::Rgb32Float,
-        FloatR32G32 => H::Rg32Float,
-        FloatR32 => H::R32Float,
-        IntR8G8B8A8 => H::Rgba8Int,
+        Uchar => H::R8Uint,
+        Uchar2 => H::Rg8Uint,
+        Uchar3 => H::Rgb8Uint,
+        Uchar4 => H::Rgba8Uint,
+        Char => H::R8Int,
+        Char2 => H::Rg8Int,
+        Char3 => H::Rgb8Int,
+        Char4 => H::Rgba8Int,
+        UcharNorm => H::R8Srgb,
+        Uchar2Norm => H::Rg8Srgb,
+        Uchar3Norm => H::Rgb8Srgb,
+        Uchar4Norm => H::Rgba8Srgb,
+        Uchar4NormBgra => H::Bgra8Srgb,
+        CharNorm => H::R8Inorm,
+        Char2Norm => H::Rg8Inorm,
+        Char3Norm => H::Rgb8Inorm,
+        Char4Norm => H::Rgba8Inorm,
+        Ushort => H::R16Uint,
+        Ushort2 => H::Rg16Uint,
+        Ushort3 => H::Rgb16Uint,
+        Ushort4 => H::Rgba16Uint,
+        Short  => H::R16Int,
+        Short2 => H::Rg16Int,
+        Short3 => H::Rgb16Int,
+        Short4 => H::Rgba16Int,
+        UshortNorm => H::R16Unorm,
+        Ushort2Norm => H::Rg16Unorm,
+        Ushort3Norm => H::Rgb16Unorm,
+        Ushort4Norm => H::Rgba16Unorm,
+        ShortNorm => H::R16Inorm,
+        Short2Norm => H::Rg16Inorm,
+        Short3Norm => H::Rgb16Inorm,
+        Short4Norm => H::Rgba16Inorm,
+        Half => H::R16Float,
+        Half2 => H::Rg16Float,
+        Half3 => H::Rgb16Float,
+        Half4 => H::Rgba16Float,
+        Float => H::R32Float,
+        Float2 => H::Rg32Float,
+        Float3 => H::Rgb32Float,
+        Float4 => H::Rgba32Float,
+        Uint => H::R32Uint,
+        Uint2 => H::Rg32Uint,
+        Uint3 => H::Rgb32Uint,
+        Uint4 => H::Rgba32Uint,
+        Int => H::R32Int,
+        Int2 => H::Rg32Int,
+        Int3 => H::Rgb32Int,
+        Int4 => H::Rgba32Int,
     }
 }
 

wgpu-native/src/pipeline.rs

@@ -125,12 +125,56 @@ pub enum IndexFormat {
 #[repr(C)]
 #[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
 pub enum VertexFormat {
-    FloatR32G32B32A32 = 0,
-    FloatR32G32B32 = 1,
-    FloatR32G32 = 2,
-    FloatR32 = 3,
-    IntR8G8B8A8 = 4,
-}
+    Uchar = 0,
+    Uchar2 = 1,
+    Uchar3 = 2,
+    Uchar4 = 3,
+    Char = 4,
+    Char2 = 5,
+    Char3 = 6,
+    Char4 = 7,
+    UcharNorm = 8,
+    Uchar2Norm = 9,
+    Uchar3Norm = 10,
+    Uchar4Norm = 11,
+    Uchar4NormBgra = 12,
+    CharNorm = 13,
+    Char2Norm = 14,
+    Char3Norm = 15,
+    Char4Norm = 16,
+    Ushort = 17,
+    Ushort2 = 18,
+    Ushort3 = 19,
+    Ushort4 = 20,
+    Short  = 21,
+    Short2 = 22,
+    Short3 = 23,
+    Short4 = 24,
+    UshortNorm = 25,
+    Ushort2Norm = 26,
+    Ushort3Norm = 27,
+    Ushort4Norm = 28,
+    ShortNorm = 29,
+    Short2Norm = 30,
+    Short3Norm = 31,
+    Short4Norm = 32,
+    Half = 33,
+    Half2 = 34,
+    Half3 = 35,
+    Half4 = 36,
+    Float = 37,
+    Float2 = 38,
+    Float3 = 39,
+    Float4 = 40,
+    Uint = 41,
+    Uint2 = 42,
+    Uint3 = 43,
+    Uint4 = 44,
+    Int = 45,
+    Int2 = 46,
+    Int3 = 47,
+    Int4 = 48,
+  }
 
 #[repr(C)]
 #[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]