Implement PUSH_CONSTANTS feature

Cargo.toml

@@ -27,14 +27,14 @@ vulkan = ["wgc/gfx-backend-vulkan"]
 package = "wgpu-core"
 version = "0.5"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "d7ee89018bed6b2e050b8160b2bd837d89f598a6"
+rev = "f67771fb87ce17a7f7e09f9a01149b4132196928"
 features = ["raw-window-handle"]
 
 [dependencies.wgt]
 package = "wgpu-types"
 version = "0.5"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "d7ee89018bed6b2e050b8160b2bd837d89f598a6"
+rev = "f67771fb87ce17a7f7e09f9a01149b4132196928"
 
 [dependencies]
 arrayvec = "0.5"

examples/README.md

@@ -5,7 +5,7 @@ For the simplest examples without using any helping code (see `framework.rs` her
   - `hello-triangle` for graphics and presentation
   - `hello-compute` for pure computing
 
-Notably, `capture` example show rendering without a surface/window. It reads back the contents and saves them to a file.
+Notably, `capture` example shows rendering without a surface/window. It reads back the contents and saves them to a file.
 
 All framework-based examples render to the window.
 
@@ -32,6 +32,7 @@ All framework-based examples render to the window.
 | compute passes         | :star: |        |        |           |        |        |                |        |
 | optional extensions    |        |        |        |           |        |        | :star:         |        |
 | - binding indexing     |        |        |        |           |        |        | :star:         |        |
+| - push constants       |        |        |        |           |        |        | :star:         |        |
 | WGSL shaders           |        |        |        |           |        |        |                |        |
 
 ## Hacking

examples/boids/main.rs

@@ -90,13 +90,15 @@ impl framework::Example for Example {
         let compute_pipeline_layout =
             device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
                 bind_group_layouts: &[&compute_bind_group_layout],
+                push_constant_ranges: &[],
             });
 
         // create render pipeline with empty bind group layout
 
         let render_pipeline_layout =
             device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
                 bind_group_layouts: &[],
+                push_constant_ranges: &[],
             });
 
         let render_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {

examples/cube/main.rs

@@ -161,6 +161,7 @@ impl framework::Example for Example {
         });
         let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
             bind_group_layouts: &[&bind_group_layout],
+            push_constant_ranges: &[],
         });
 
         // Create the texture

examples/framework.rs

@@ -33,6 +33,9 @@ pub trait Example: 'static + Sized {
     fn needed_features() -> wgpu::Features {
         wgpu::Features::empty()
     }
+    fn needed_limits() -> wgpu::Limits {
+        wgpu::Limits::default()
+    }
     fn init(
         sc_desc: &wgpu::SwapChainDescriptor,
         device: &wgpu::Device,
@@ -97,12 +100,14 @@ async fn setup<E: Example>(title: &str) -> Setup {
 
     let adapter_features = adapter.features();
 
+    let needed_limits = E::needed_limits();
+
     let trace_dir = std::env::var("WGPU_TRACE");
     let (device, queue) = adapter
         .request_device(
             &wgpu::DeviceDescriptor {
                 features: adapter_features & needed_features,
-                limits: wgpu::Limits::default(),
+                limits: needed_limits,
                 shader_validation: true,
             },
             trace_dir.ok().as_ref().map(std::path::Path::new),

examples/hello-compute/main.rs

@@ -81,6 +81,7 @@ async fn execute_gpu(numbers: Vec<u32>) -> Vec<u32> {
 
     let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
         bind_group_layouts: &[&bind_group_layout],
+        push_constant_ranges: &[],
     });
 
     let compute_pipeline = device.create_compute_pipeline(&wgpu::ComputePipelineDescriptor {

examples/hello-triangle/main.rs

@@ -36,6 +36,7 @@ async fn run(event_loop: EventLoop<()>, window: Window, swapchain_format: wgpu::
 
     let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
         bind_group_layouts: &[],
+        push_constant_ranges: &[],
     });
 
     let render_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {

examples/hello/main.rs

@@ -1,5 +1,6 @@
 /// This example shows how to describe the adapter in use.
 async fn run() {
+    #[cfg_attr(target_arch = "wasm32", allow(unused_variables))]
     let adapter = wgpu::Instance::new(wgpu::BackendBit::PRIMARY)
         .request_adapter(&wgpu::RequestAdapterOptions {
             power_preference: wgpu::PowerPreference::Default,

examples/mipmap/main.rs

@@ -101,6 +101,7 @@ impl Example {
         });
         let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
             bind_group_layouts: &[&bind_group_layout],
+            push_constant_ranges: &[],
         });
 
         let vs_module = device.create_shader_module(wgpu::include_spirv!("blit.vert.spv"));
@@ -249,6 +250,7 @@ impl framework::Example for Example {
         });
         let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
             bind_group_layouts: &[&bind_group_layout],
+            push_constant_ranges: &[],
         });
 
         // Create the texture

examples/msaa-line/main.rs

@@ -141,6 +141,7 @@ impl framework::Example for Example {
 
         let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
             bind_group_layouts: &[],
+            push_constant_ranges: &[],
         });
 
         let multisampled_framebuffer =

examples/shadow/main.rs

@@ -442,6 +442,7 @@ impl framework::Example for Example {
                 });
             let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
                 bind_group_layouts: &[&bind_group_layout, &local_bind_group_layout],
+                push_constant_ranges: &[],
             });
 
             let uniform_buf = device.create_buffer(&wgpu::BufferDescriptor {
@@ -553,6 +554,7 @@ impl framework::Example for Example {
                 });
             let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
                 bind_group_layouts: &[&bind_group_layout, &local_bind_group_layout],
+                push_constant_ranges: &[],
             });
 
             let mx_total = Self::generate_matrix(sc_desc.width as f32 / sc_desc.height as f32);

examples/skybox/main.rs

@@ -84,6 +84,7 @@ impl framework::Example for Skybox {
 
         let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
             bind_group_layouts: &[&bind_group_layout],
+            push_constant_ranges: &[],
         });
 
         // Create the render pipeline

examples/texture-arrays/main.rs

@@ -23,12 +23,6 @@ struct Uniform {
 unsafe impl Pod for Uniform {}
 unsafe impl Zeroable for Uniform {}
 
-struct UniformWorkaroundData {
-    bind_group_layout: wgpu::BindGroupLayout,
-    bind_group0: wgpu::BindGroup,
-    bind_group1: wgpu::BindGroup,
-}
-
 fn vertex(pos: [i8; 2], tc: [i8; 2], index: i8) -> Vertex {
     Vertex {
         _pos: [pos[0] as f32, pos[1] as f32],
@@ -81,7 +75,7 @@ struct Example {
     bind_group: wgpu::BindGroup,
     vertex_buffer: wgpu::Buffer,
     index_buffer: wgpu::Buffer,
-    uniform_workaround_data: Option<UniformWorkaroundData>,
+    uniform_workaround: bool,
 }
 
 impl framework::Example for Example {
@@ -90,6 +84,13 @@ impl framework::Example for Example {
             | wgpu::Features::SAMPLED_TEXTURE_ARRAY_NON_UNIFORM_INDEXING
             | wgpu::Features::SAMPLED_TEXTURE_ARRAY_DYNAMIC_INDEXING
             | wgpu::Features::SAMPLED_TEXTURE_BINDING_ARRAY
+            | wgpu::Features::PUSH_CONSTANTS
+    }
+    fn needed_limits() -> wgpu::Limits {
+        wgpu::Limits {
+            max_push_constant_size: 4,
+            ..wgpu::Limits::default()
+        }
     }
     fn init(
         sc_desc: &wgpu::SwapChainDescriptor,
@@ -131,56 +132,6 @@ impl framework::Example for Example {
         let index_buffer = device
             .create_buffer_with_data(bytemuck::cast_slice(&index_data), wgpu::BufferUsage::INDEX);
 
-        let uniform_workaround_data = if uniform_workaround {
-            let buffer0 = device.create_buffer_with_data(
-                &bytemuck::cast_slice(&[Uniform { index: 0 }]),
-                wgpu::BufferUsage::UNIFORM,
-            );
-            let buffer1 = device.create_buffer_with_data(
-                &bytemuck::cast_slice(&[Uniform { index: 1 }]),
-                wgpu::BufferUsage::UNIFORM,
-            );
-
-            let bind_group_layout =
-                device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
-                    entries: &[wgpu::BindGroupLayoutEntry::new(
-                        0,
-                        wgpu::ShaderStage::FRAGMENT,
-                        wgpu::BindingType::UniformBuffer {
-                            dynamic: false,
-                            min_binding_size: None,
-                        },
-                    )],
-                    label: Some("uniform workaround bind group layout"),
-                });
-
-            let bind_group0 = device.create_bind_group(&wgpu::BindGroupDescriptor {
-                layout: &bind_group_layout,
-                entries: &[wgpu::BindGroupEntry {
-                    binding: 0,
-                    resource: wgpu::BindingResource::Buffer(buffer0.slice(..)),
-                }],
-                label: Some("uniform workaround bind group 0"),
-            });
-
-            let bind_group1 = device.create_bind_group(&wgpu::BindGroupDescriptor {
-                layout: &bind_group_layout,
-                entries: &[wgpu::BindGroupEntry {
-                    binding: 0,
-                    resource: wgpu::BindingResource::Buffer(buffer1.slice(..)),
-                }],
-                label: Some("uniform workaround bind group 1"),
-            });
-
-            Some(UniformWorkaroundData {
-                bind_group_layout,
-                bind_group0,
-                bind_group1,
-            })
-        } else {
-            None
-        };
-
         let red_texture_data = create_texture_data(Color::RED);
         let green_texture_data = create_texture_data(Color::GREEN);
 
@@ -289,13 +240,18 @@ impl framework::Example for Example {
             label: Some("bind group"),
         });
 
-        let pipeline_layout = if let Some(ref workaround) = uniform_workaround_data {
+        let pipeline_layout = if uniform_workaround {
             device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
-                bind_group_layouts: &[&bind_group_layout, &workaround.bind_group_layout],
+                bind_group_layouts: &[&bind_group_layout],
+                push_constant_ranges: &[wgpu::PushConstantRange {
+                    stages: wgpu::ShaderStage::FRAGMENT,
+                    range: 0..4,
+                }],
             })
         } else {
             device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
                 bind_group_layouts: &[&bind_group_layout],
+                push_constant_ranges: &[],
             })
         };
 
@@ -342,7 +298,7 @@ impl framework::Example for Example {
             index_buffer,
             bind_group,
             pipeline,
-            uniform_workaround_data,
+            uniform_workaround,
         }
     }
     fn resize(
@@ -378,14 +334,28 @@ impl framework::Example for Example {
             }],
             depth_stencil_attachment: None,
         });
+
+        let uniform_workaround_data = if self.uniform_workaround {
+            Some([Uniform { index: 0 }, Uniform { index: 1 }])
+        } else {
+            None
+        };
         rpass.set_pipeline(&self.pipeline);
         rpass.set_bind_group(0, &self.bind_group, &[]);
         rpass.set_vertex_buffer(0, self.vertex_buffer.slice(..));
         rpass.set_index_buffer(self.index_buffer.slice(..));
-        if let Some(ref workaround) = self.uniform_workaround_data {
-            rpass.set_bind_group(1, &workaround.bind_group0, &[]);
+        if let Some(ref data) = uniform_workaround_data {
+            rpass.set_push_constants(
+                wgpu::ShaderStage::FRAGMENT,
+                0,
+                bytemuck::cast_slice(&data[0..1]),
+            );
             rpass.draw_indexed(0..6, 0, 0..1);
-            rpass.set_bind_group(1, &workaround.bind_group1, &[]);
+            rpass.set_push_constants(
+                wgpu::ShaderStage::FRAGMENT,
+                0,
+                bytemuck::cast_slice(&data[1..2]),
+            );
             rpass.draw_indexed(6..12, 0, 0..1);
         } else {
             rpass.draw_indexed(0..12, 0, 0..1);

examples/texture-arrays/uniform.frag

@@ -6,7 +6,7 @@ layout(location = 0) out vec4 o_Color;
 
 layout(set = 0, binding = 0) uniform texture2D u_Textures[2];
 layout(set = 0, binding = 1) uniform sampler u_Sampler;
-layout(set = 1, binding = 0) uniform Uniforms {
+layout(push_constant) uniform Uniforms {
     int u_Index;  // dynamically uniform
 };
 

examples/water/main.rs

@@ -414,11 +414,13 @@ impl framework::Example for Example {
         let water_pipeline_layout =
             device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
                 bind_group_layouts: &[&water_bind_group_layout],
+                push_constant_ranges: &[],
             });
 
         let terrain_pipeline_layout =
             device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
                 bind_group_layouts: &[&terrain_bind_group_layout],
+                push_constant_ranges: &[],
             });
 
         let water_uniform_buf = device.create_buffer(&wgpu::BufferDescriptor {