Merge #82

82: Add updated texture formats r=kvark a=unconed

Adds the texture formats from:
https://github.com/gpuweb/gpuweb/blob/master/design/sketch.webidl


Co-authored-by: Steven Wittens <steven@acko.net>

Author: bors[bot]

examples/hello_triangle_c/main.c

@@ -136,7 +136,7 @@ int main()
 
     WGPUAttachment attachments[ATTACHMENTS_LENGTH] = {
         {
-            .format = WGPUTextureFormat_B8g8r8a8Unorm,
+            .format = WGPUTextureFormat_Bgra8Unorm,
             .samples = 1,
         },
     };
@@ -202,7 +202,7 @@ int main()
 
     WGPUSwapChainDescriptor swap_chain_desc = {
         .usage = WGPUTextureUsageFlags_OUTPUT_ATTACHMENT | WGPUTextureUsageFlags_PRESENT,
-        .format = WGPUTextureFormat_B8g8r8a8Unorm,
+        .format = WGPUTextureFormat_Bgra8Unorm,
         .width = 640,
         .height = 480,
     };

examples/hello_triangle_rust/main.rs

@@ -45,7 +45,7 @@ fn main() {
         primitive_topology: wgpu::PrimitiveTopology::TriangleList,
         color_states: &[
             wgpu::ColorStateDescriptor {
-                format: wgpu::TextureFormat::B8g8r8a8Unorm,
+                format: wgpu::TextureFormat::Bgra8Unorm,
                 color: wgpu::BlendDescriptor::REPLACE,
                 alpha: wgpu::BlendDescriptor::REPLACE,
                 write_mask: wgpu::ColorWriteFlags::ALL,
@@ -69,7 +69,7 @@ fn main() {
     let surface = instance.create_surface(&window);
     let mut swap_chain = device.create_swap_chain(&surface, &wgpu::SwapChainDescriptor {
         usage: wgpu::TextureUsageFlags::OUTPUT_ATTACHMENT,
-        format: wgpu::TextureFormat::B8g8r8a8Unorm,
+        format: wgpu::TextureFormat::Bgra8Unorm,
         width: size.width as u32,
         height: size.height as u32,
     });

gfx-examples/src/cube.rs

@@ -180,7 +180,7 @@ impl framework::Example for Example {
             size: texture_extent,
             array_size: 1,
             dimension: wgpu::TextureDimension::D2,
-            format: wgpu::TextureFormat::R8g8b8a8Unorm,
+            format: wgpu::TextureFormat::Rgba8Unorm,
             usage: wgpu::TextureUsageFlags::SAMPLED | wgpu::TextureUsageFlags::TRANSFER_DST,
         });
         let texture_view = texture.create_default_view();

gfx-examples/src/framework.rs

@@ -78,7 +78,7 @@ pub fn run<E: Example>(title: &str) {
     let surface = instance.create_surface(&window);
     let mut sc_desc = wgpu::SwapChainDescriptor {
         usage: wgpu::TextureUsageFlags::OUTPUT_ATTACHMENT,
-        format: wgpu::TextureFormat::B8g8r8a8Unorm,
+        format: wgpu::TextureFormat::Bgra8Unorm,
         width: size.width as u32,
         height: size.height as u32,
     };

wgpu-bindings/wgpu.h

@@ -127,11 +127,54 @@ typedef enum {
 } WGPUTextureDimension;
 
 typedef enum {
-  WGPUTextureFormat_R8g8b8a8Unorm = 0,
-  WGPUTextureFormat_R8g8b8a8Uint = 1,
-  WGPUTextureFormat_B8g8r8a8Unorm = 2,
-  WGPUTextureFormat_D32Float = 3,
-  WGPUTextureFormat_D32FloatS8Uint = 4,
+  WGPUTextureFormat_R8Unorm = 0,
+  WGPUTextureFormat_R8UnormSrgb = 1,
+  WGPUTextureFormat_R8Snorm = 2,
+  WGPUTextureFormat_R8Uint = 3,
+  WGPUTextureFormat_R8Sint = 4,
+  WGPUTextureFormat_R16Unorm = 5,
+  WGPUTextureFormat_R16Snorm = 6,
+  WGPUTextureFormat_R16Uint = 7,
+  WGPUTextureFormat_R16Sint = 8,
+  WGPUTextureFormat_R16Float = 9,
+  WGPUTextureFormat_Rg8Unorm = 10,
+  WGPUTextureFormat_Rg8UnormSrgb = 11,
+  WGPUTextureFormat_Rg8Snorm = 12,
+  WGPUTextureFormat_Rg8Uint = 13,
+  WGPUTextureFormat_Rg8Sint = 14,
+  WGPUTextureFormat_B5g6r5Unorm = 15,
+  WGPUTextureFormat_R32Uint = 16,
+  WGPUTextureFormat_R32Sint = 17,
+  WGPUTextureFormat_R32Float = 18,
+  WGPUTextureFormat_Rg16Unorm = 19,
+  WGPUTextureFormat_Rg16Snorm = 20,
+  WGPUTextureFormat_Rg16Uint = 21,
+  WGPUTextureFormat_Rg16Sint = 22,
+  WGPUTextureFormat_Rg16Float = 23,
+  WGPUTextureFormat_Rgba8Unorm = 24,
+  WGPUTextureFormat_Rgba8UnormSrgb = 25,
+  WGPUTextureFormat_Rgba8Snorm = 26,
+  WGPUTextureFormat_Rgba8Uint = 27,
+  WGPUTextureFormat_Rgba8Sint = 28,
+  WGPUTextureFormat_Bgra8Unorm = 29,
+  WGPUTextureFormat_Bgra8UnormSrgb = 30,
+  WGPUTextureFormat_Rgb10a2Unorm = 31,
+  WGPUTextureFormat_Rg11b10Float = 32,
+  WGPUTextureFormat_Rg32Uint = 33,
+  WGPUTextureFormat_Rg32Sint = 34,
+  WGPUTextureFormat_Rg32Float = 35,
+  WGPUTextureFormat_Rgba16Unorm = 36,
+  WGPUTextureFormat_Rgba16Snorm = 37,
+  WGPUTextureFormat_Rgba16Uint = 38,
+  WGPUTextureFormat_Rgba16Sint = 39,
+  WGPUTextureFormat_Rgba16Float = 40,
+  WGPUTextureFormat_Rgba32Uint = 41,
+  WGPUTextureFormat_Rgba32Sint = 42,
+  WGPUTextureFormat_Rgba32Float = 43,
+  WGPUTextureFormat_D16Unorm = 44,
+  WGPUTextureFormat_D32Float = 45,
+  WGPUTextureFormat_D24UnormS8Uint = 46,
+  WGPUTextureFormat_D32FloatS8Uint = 47,
 } WGPUTextureFormat;
 
 typedef enum {

wgpu-native/src/conv.rs

@@ -287,10 +287,69 @@ pub fn map_texture_format(texture_format: resource::TextureFormat) -> hal::forma
     use hal::format::Format as H;
     use crate::resource::TextureFormat::*;
     match texture_format {
-        R8g8b8a8Unorm => H::Rgba8Unorm,
-        R8g8b8a8Uint => H::Rgba8Uint,
-        B8g8r8a8Unorm => H::Bgra8Unorm,
+        // Normal 8 bit formats
+        R8Unorm => H::R8Unorm,
+        R8UnormSrgb => H::R8Srgb,
+        R8Snorm => H::R8Inorm,
+        R8Uint => H::R8Uint,
+        R8Sint => H::R8Int,
+
+        // Normal 16 bit formats
+        R16Unorm => H::R16Unorm,
+        R16Snorm => H::R16Inorm,
+        R16Uint => H::R16Uint,
+        R16Sint => H::R16Int,
+        R16Float => H::R16Float,
+
+        Rg8Unorm => H::Rg8Unorm,
+        Rg8UnormSrgb => H::Rg8Srgb,
+        Rg8Snorm => H::Rg8Inorm,
+        Rg8Uint => H::Rg8Uint,
+        Rg8Sint => H::Rg8Int,
+
+        // Packed 16 bit formats
+        B5g6r5Unorm => H::B5g6r5Unorm,
+
+        // Normal 32 bit formats
+        R32Uint => H::R32Uint,
+        R32Sint => H::R32Int,
+        R32Float => H::R32Float,
+        Rg16Unorm => H::Rg16Unorm,
+        Rg16Snorm => H::Rg16Inorm,
+        Rg16Uint => H::Rg16Uint,
+        Rg16Sint => H::Rg16Int,
+        Rg16Float => H::Rg16Float,
+        Rgba8Unorm => H::Rgba8Unorm,
+        Rgba8UnormSrgb => H::Rgba8Srgb,
+        Rgba8Snorm => H::Rgba8Inorm,
+        Rgba8Uint => H::Rgba8Uint,
+        Rgba8Sint => H::Rgba8Int,
+        Bgra8Unorm => H::Bgra8Unorm,
+        Bgra8UnormSrgb => H::Bgra8Srgb,
+
+        // Packed 32 bit formats
+        Rgb10a2Unorm => H::A2r10g10b10Unorm,
+        Rg11b10Float => H::B10g11r11Ufloat,
+
+        // Normal 64 bit formats
+        Rg32Uint => H::Rg32Uint,
+        Rg32Sint => H::Rg32Int,
+        Rg32Float => H::Rg32Float,
+        Rgba16Unorm => H::Rgba16Unorm,
+        Rgba16Snorm => H::Rgba16Inorm,
+        Rgba16Uint => H::Rgba16Uint,
+        Rgba16Sint => H::Rgba16Int,
+        Rgba16Float => H::Rgba16Float,
+
+        // Normal 128 bit formats
+        Rgba32Uint => H::Rgba32Uint,
+        Rgba32Sint => H::Rgba32Int,
+        Rgba32Float => H::Rgba32Float,
+
+        // Depth and stencil formats
+        D16Unorm => H::D16Unorm,
         D32Float => H::D32Float,
+        D24UnormS8Uint => H::D24UnormS8Uint,
         D32FloatS8Uint => H::D32FloatS8Uint,
     }
 }

wgpu-native/src/resource.rs

@@ -76,11 +76,70 @@ pub enum TextureDimension {
 #[repr(C)]
 #[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
 pub enum TextureFormat {
-    R8g8b8a8Unorm = 0,
-    R8g8b8a8Uint = 1,
-    B8g8r8a8Unorm = 2,
-    D32Float = 3,
-    D32FloatS8Uint = 4,
+    // Normal 8 bit formats
+    R8Unorm = 0,
+    R8UnormSrgb = 1,
+    R8Snorm = 2,
+    R8Uint = 3,
+    R8Sint = 4,
+
+    // Normal 16 bit formats
+    R16Unorm = 5,
+    R16Snorm = 6,
+    R16Uint = 7,
+    R16Sint = 8,
+    R16Float = 9,
+
+    Rg8Unorm = 10,
+    Rg8UnormSrgb = 11,
+    Rg8Snorm = 12,
+    Rg8Uint = 13,
+    Rg8Sint = 14,
+
+    // Packed 16 bit formats
+    B5g6r5Unorm = 15,
+
+    // Normal 32 bit formats
+    R32Uint = 16,
+    R32Sint = 17,
+    R32Float = 18,
+    Rg16Unorm = 19,
+    Rg16Snorm = 20,
+    Rg16Uint = 21,
+    Rg16Sint = 22,
+    Rg16Float = 23,
+    Rgba8Unorm = 24,
+    Rgba8UnormSrgb = 25,
+    Rgba8Snorm = 26,
+    Rgba8Uint = 27,
+    Rgba8Sint = 28,
+    Bgra8Unorm = 29,
+    Bgra8UnormSrgb = 30,
+
+    // Packed 32 bit formats
+    Rgb10a2Unorm = 31,
+    Rg11b10Float = 32,
+
+    // Normal 64 bit formats
+    Rg32Uint = 33,
+    Rg32Sint = 34,
+    Rg32Float = 35,
+    Rgba16Unorm = 36,
+    Rgba16Snorm = 37,
+    Rgba16Uint = 38,
+    Rgba16Sint = 39,
+    Rgba16Float = 40,
+
+    // Normal 128 bit formats
+    Rgba32Uint = 41,
+    Rgba32Sint = 42,
+    Rgba32Float = 43,
+
+    // Depth and stencil formats
+    D16Unorm = 44,
+    D32Float = 45,
+    D24UnormS8Uint = 46,
+    D32FloatS8Uint = 47,
 }
 
 bitflags! {