Separate object identity from storage

.travis.yml

@@ -14,4 +14,4 @@ before_install:
 
 script:
   - cargo test
-  - cargo check --manifest-path wgpu-native/Cargo.toml --features remote
+  - cargo check --manifest-path wgpu-native/Cargo.toml

Makefile

@@ -60,7 +60,7 @@ examples-native: lib-native wgpu-bindings/wgpu.h $(wildcard wgpu-native/**/*.c)
 	#$(MAKE) -C examples
 
 examples-rust: lib-rust examples/Cargo.toml $(wildcard wgpu-native/**/*.rs)
-	cargo build --manifest-path examples/Cargo.toml --features winit,$(FEATURE_RUST)
+	cargo build --manifest-path examples/Cargo.toml --features $(FEATURE_RUST)
 
 examples-gfx: lib-rust gfx-examples/Cargo.toml $(wildcard gfx-examples/*.rs)
 	cargo build --manifest-path gfx-examples/Cargo.toml --features $(FEATURE_RUST)

examples/Cargo.toml

@@ -17,13 +17,13 @@ path = "hello_compute_rust/main.rs"
 
 [features]
 default = []
-remote = ["wgpu-native/remote"]
+local = ["wgpu-native/local"]
 metal = ["wgpu/metal"]
 dx11 = ["wgpu/dx11"]
 dx12 = ["wgpu/dx12"]
 vulkan = ["wgpu/vulkan"]
 
 [dependencies]
 wgpu-native = { path = "../wgpu-native" }
-wgpu = { path = "../wgpu-rs", features=["winit"] }
+wgpu = { path = "../wgpu-rs" }
 env_logger = "0.5"

examples/hello_compute_rust/main.rs

@@ -81,7 +81,6 @@ fn main() {
         layout: &pipeline_layout,
         compute_stage: wgpu::PipelineStageDescriptor {
             module: &cs_module,
-            stage: wgpu::ShaderStage::Compute,
             entry_point: "main",
         },
     });

examples/hello_triangle_rust/main.rs

@@ -25,36 +25,36 @@ fn main() {
         bind_group_layouts: &[&bind_group_layout],
     });
 
-    let blend_state0 = device.create_blend_state(&wgpu::BlendStateDescriptor::REPLACE);
-    let depth_stencil_state =
-        device.create_depth_stencil_state(&wgpu::DepthStencilStateDescriptor::IGNORE);
-
     let render_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
         layout: &pipeline_layout,
-        stages: &[
-            wgpu::PipelineStageDescriptor {
-                module: &vs_module,
-                stage: wgpu::ShaderStage::Vertex,
-                entry_point: "main",
-            },
-            wgpu::PipelineStageDescriptor {
-                module: &fs_module,
-                stage: wgpu::ShaderStage::Fragment,
-                entry_point: "main",
-            },
-        ],
+        vertex_stage: wgpu::PipelineStageDescriptor {
+            module: &vs_module,
+            entry_point: "main",
+        },
+        fragment_stage: wgpu::PipelineStageDescriptor {
+            module: &fs_module,
+            entry_point: "main",
+        },
+        rasterization_state: wgpu::RasterizationStateDescriptor {
+            front_face: wgpu::FrontFace::Ccw,
+            cull_mode: wgpu::CullMode::None,
+            depth_bias: 0,
+            depth_bias_slope_scale: 0.0,
+            depth_bias_clamp: wgpu::MAX_DEPTH_BIAS_CLAMP,
+        },
         primitive_topology: wgpu::PrimitiveTopology::TriangleList,
-        attachments_state: wgpu::AttachmentsState {
-            color_attachments: &[wgpu::Attachment {
+        color_states: &[
+            wgpu::ColorStateDescriptor {
                 format: wgpu::TextureFormat::B8g8r8a8Unorm,
-                samples: 1,
-            }],
-            depth_stencil_attachment: None,
-        },
-        blend_states: &[&blend_state0],
-        depth_stencil_state: &depth_stencil_state,
+                color: wgpu::BlendDescriptor::REPLACE,
+                alpha: wgpu::BlendDescriptor::REPLACE,
+                write_mask: wgpu::ColorWriteFlags::ALL,
+            },
+        ],
+        depth_stencil_state: None,
         index_format: wgpu::IndexFormat::Uint16,
         vertex_buffers: &[],
+        sample_count: 1,
     });
 
     use wgpu::winit::{ControlFlow, Event, ElementState, EventsLoop, KeyboardInput, Window, WindowEvent, VirtualKeyCode};

gfx-examples/Cargo.toml

@@ -20,7 +20,7 @@ dx12 = ["wgpu/dx12"]
 vulkan = ["wgpu/vulkan"]
 
 [dependencies]
-wgpu = { path = "../wgpu-rs", features = ["winit"] }
+wgpu = { path = "../wgpu-rs" }
 cgmath = "0.17"
 env_logger = "0.5"
 glsl-to-spirv = "0.1"

gfx-examples/src/cube.rs

@@ -152,7 +152,7 @@ impl framework::Example for Cube {
             format: wgpu::TextureFormat::R8g8b8a8Unorm,
             usage: wgpu::TextureUsageFlags::SAMPLED | wgpu::TextureUsageFlags::TRANSFER_DST
         });
-        let texture_view = texture.create_default_texture_view();
+        let texture_view = texture.create_default_view();
         let temp_buf = device.create_buffer(&wgpu::BufferDescriptor {
             size: texels.len() as u32,
             usage: wgpu::BufferUsageFlags::TRANSFER_SRC | wgpu::BufferUsageFlags::TRANSFER_DST
@@ -232,39 +232,38 @@ impl framework::Example for Cube {
         });
 
         // Create the render pipeline
-        let vs_bytes = framework::load_glsl("cube.vert", wgpu::ShaderStage::Vertex);
-        let fs_bytes = framework::load_glsl("cube.frag", wgpu::ShaderStage::Fragment);
+        let vs_bytes = framework::load_glsl("cube.vert", framework::ShaderStage::Vertex);
+        let fs_bytes = framework::load_glsl("cube.frag", framework::ShaderStage::Fragment);
         let vs_module = device.create_shader_module(&vs_bytes);
         let fs_module = device.create_shader_module(&fs_bytes);
 
-        let blend_state0 = device.create_blend_state(&wgpu::BlendStateDescriptor::REPLACE);
-        let depth_stencil_state =
-            device.create_depth_stencil_state(&wgpu::DepthStencilStateDescriptor::IGNORE);
-
         let pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
             layout: &pipeline_layout,
-            stages: &[
-                wgpu::PipelineStageDescriptor {
-                    module: &vs_module,
-                    stage: wgpu::ShaderStage::Vertex,
-                    entry_point: "main",
-                },
-                wgpu::PipelineStageDescriptor {
-                    module: &fs_module,
-                    stage: wgpu::ShaderStage::Fragment,
-                    entry_point: "main",
-                },
-            ],
+            vertex_stage: wgpu::PipelineStageDescriptor {
+                module: &vs_module,
+                entry_point: "main",
+            },
+            fragment_stage: wgpu::PipelineStageDescriptor {
+                module: &fs_module,
+                entry_point: "main",
+            },
+            rasterization_state: wgpu::RasterizationStateDescriptor {
+                front_face: wgpu::FrontFace::Cw,
+                cull_mode: wgpu::CullMode::Back,
+                depth_bias: 0,
+                depth_bias_slope_scale: 0.0,
+                depth_bias_clamp: wgpu::MAX_DEPTH_BIAS_CLAMP,
+            },
             primitive_topology: wgpu::PrimitiveTopology::TriangleList,
-            attachments_state: wgpu::AttachmentsState {
-                color_attachments: &[wgpu::Attachment {
+            color_states: &[
+                wgpu::ColorStateDescriptor {
                     format: sc_desc.format,
-                    samples: 1,
-                }],
-                depth_stencil_attachment: None,
-            },
-            blend_states: &[&blend_state0],
-            depth_stencil_state: &depth_stencil_state,
+                    color: wgpu::BlendDescriptor::REPLACE,
+                    alpha: wgpu::BlendDescriptor::REPLACE,
+                    write_mask: wgpu::ColorWriteFlags::ALL,
+                },
+            ],
+            depth_stencil_state: None,
             index_format: wgpu::IndexFormat::Uint16,
             vertex_buffers: &[
                 wgpu::VertexBufferDescriptor {
@@ -284,6 +283,7 @@ impl framework::Example for Cube {
                     ],
                 },
             ],
+            sample_count: 1,
         });
 
         // Done

gfx-examples/src/framework.rs

@@ -10,15 +10,22 @@ pub fn cast_slice<T>(data: &[T]) -> &[u8] {
     }
 }
 
-pub fn load_glsl(name: &str, stage: wgpu::ShaderStage) -> Vec<u8> {
+#[allow(dead_code)]
+pub enum ShaderStage {
+    Vertex,
+    Fragment,
+    Compute,
+}
+
+pub fn load_glsl(name: &str, stage: ShaderStage) -> Vec<u8> {
     use std::fs::read_to_string;
     use std::io::Read;
     use std::path::PathBuf;
 
     let ty = match stage {
-        wgpu::ShaderStage::Vertex => glsl_to_spirv::ShaderType::Vertex,
-        wgpu::ShaderStage::Fragment => glsl_to_spirv::ShaderType::Fragment,
-        wgpu::ShaderStage::Compute => glsl_to_spirv::ShaderType::Compute,
+        ShaderStage::Vertex => glsl_to_spirv::ShaderType::Vertex,
+        ShaderStage::Fragment => glsl_to_spirv::ShaderType::Fragment,
+        ShaderStage::Compute => glsl_to_spirv::ShaderType::Compute,
     };
     let path = PathBuf::from("data").join(name);
     let code = read_to_string(path).unwrap();

wgpu-bindings/src/main.rs

@@ -36,6 +36,7 @@ fn main() {
         .with_crate(source_dir)
         .with_config(config)
         .with_parse_expand(&["wgpu-native"])
+        .with_parse_expand_features(&["local"])
         .generate()
         .unwrap()
         .write_to_file(crate_dir.join("wgpu.h"));