- refactor push_constants api

Author: polymonster

examples/bindful/main.rs

@@ -166,22 +166,20 @@ fn main() -> Result<(), hotline_rs::Error> {
         cmdbuffer.set_binding(pso_pmfx, 2, 0, gfx::DescriptorType::ShaderResource, dev.get_shader_heap(), srv2);
         cmdbuffer.set_binding(pso_pmfx, 3, 0, gfx::DescriptorType::ShaderResource, dev.get_shader_heap(), srv3);
 
-        // lookup push constants for letterboxing the quad
-        if let Some(c0) = pso_pmfx.get_pipeline_slot(0, 0, gfx::DescriptorType::PushConstants) {
-            let pc = if vp_rect.width >= vp_rect.height {
-                LetterboxPushConstants {
-                    x: vp_rect.height as f32 / vp_rect.width as f32,
-                    y: 1.0
-                }
+        // push constants for letterboxing the quad
+        let pc = if vp_rect.width >= vp_rect.height {
+            LetterboxPushConstants {
+                x: vp_rect.height as f32 / vp_rect.width as f32,
+                y: 1.0
             }
-            else {
-                LetterboxPushConstants {
-                    x: 1.0,
-                    y: vp_rect.width as f32 / vp_rect.height as f32
-                }
-            };
-            cmdbuffer.push_render_constants(c0.index, 2, 0, gfx::as_u8_slice(&pc));
         }
+        else {
+            LetterboxPushConstants {
+                x: 1.0,
+                y: vp_rect.width as f32 / vp_rect.height as f32
+            }
+        };
+        cmdbuffer.push_render_constants(pso_pmfx, 0, 0, 2, 0, gfx::as_u8_slice(&pc));
 
         cmdbuffer.set_index_buffer(&index_buffer);
         cmdbuffer.set_vertex_buffer(&vertex_buffer, 0);

examples/bindless/main.rs

@@ -111,7 +111,6 @@ fn main() -> Result<(), hotline_rs::Error> {
     let mut pmfx : pmfx::Pmfx<gfx_platform::Device> = pmfx::Pmfx::create(&mut dev, 0);
 
     pmfx.load(&hotline_rs::get_data_path("shaders/bindless"))?;
-    pmfx.create_compute_pipeline(&dev, "compute_rw")?;
     pmfx.create_render_pipeline(&dev, "bindless", swap_chain.get_backbuffer_pass())?;
 
     let fmt = swap_chain.get_backbuffer_pass().get_format_hash();
@@ -171,27 +170,23 @@ fn main() -> Result<(), hotline_rs::Error> {
         cmdbuffer.set_index_buffer(&index_buffer);
         cmdbuffer.set_vertex_buffer(&vertex_buffer, 0);
 
-        // lookup push constants for letterboxing the quad and push the data
-        if let Some(c0) = pso_pmfx.get_pipeline_slot(0, 0, gfx::DescriptorType::PushConstants) {
-            let pc = if vp_rect.width >= vp_rect.height {
-                LetterboxPushConstants {
-                    x: vp_rect.height as f32 / vp_rect.width as f32,
-                    y: 1.0
-                }
+        // push constants for letterboxing the quad
+        let pc = if vp_rect.width >= vp_rect.height {
+            LetterboxPushConstants {
+                x: vp_rect.height as f32 / vp_rect.width as f32,
+                y: 1.0
             }
-            else {
-                LetterboxPushConstants {
-                    x: 1.0,
-                    y: vp_rect.width as f32 / vp_rect.height as f32
-                }
-            };
-            cmdbuffer.push_render_constants(c0.index, 2, 0, gfx::as_u8_slice(&pc));
         }
+        else {
+            LetterboxPushConstants {
+                x: 1.0,
+                y: vp_rect.width as f32 / vp_rect.height as f32
+            }
+        };
+        cmdbuffer.push_render_constants(pso_pmfx, 0, 0, 2, 0, gfx::as_u8_slice(&pc));
 
-        // lookup push srv indices and push the data
-        if let Some(c1) = pso_pmfx.get_pipeline_slot(1, 0, gfx::DescriptorType::PushConstants) {
-            cmdbuffer.push_render_constants(c1.index, 4, 0, gfx::as_u8_slice(&srv_indices));
-        }
+        // push srv indices
+        cmdbuffer.push_render_constants(pso_pmfx, 1, 0, 4, 0, gfx::as_u8_slice(&srv_indices));
 
         cmdbuffer.draw_indexed_instanced(6, 1, 0, 0, 0);
 

examples/raytraced_triangle/main.rs

@@ -166,7 +166,7 @@ fn main() -> Result<(), hotline_rs::Error> {
         // set push constants on b0
         let border = 0.1;
         let aspect = window_rect.width as f32 / window_rect.height as f32;
-        cmd.push_compute_constants(0, 8, 0, gfx::as_u8_slice(&[
+        cmd.push_compute_constants(&raytracing_pipeline.pipeline, 0, 0, 8, 0, gfx::as_u8_slice(&[
             // viewport
             -1.0 + border,
             -1.0 + border * aspect,

plugins/ecs_examples/src/bindless_material_ibl.rs

@@ -179,21 +179,15 @@ pub fn render_meshes_bindless_ibl(
     cmd_buf.set_render_pipeline(&pipeline);
 
     // bind view push constants
-    let slot = pipeline.get_pipeline_slot(0, 0, gfx::DescriptorType::PushConstants);
-    if let Some(slot) = slot {
-        cmd_buf.push_render_constants(slot.index, 16, 0, gfx::as_u8_slice(&camera.view_projection_matrix));
-        cmd_buf.push_render_constants(slot.index, 4, 16, gfx::as_u8_slice(&camera.view_position));
-    }
+    cmd_buf.push_render_constants(pipeline, 0, 0, 16, 0, gfx::as_u8_slice(&camera.view_projection_matrix));
+    cmd_buf.push_render_constants(pipeline, 0, 0, 4, 16, gfx::as_u8_slice(&camera.view_position));
 
     // bind world buffer info with IBL indices in user_data
     let mut world_buffer_info = pmfx.get_world_buffer_info();
     world_buffer_info.user_data[0] = ibl_data.cubemap_srv;
     world_buffer_info.user_data[1] = ibl_data.lut_srv;
-    let slot = pipeline.get_pipeline_slot(2, 0, gfx::DescriptorType::PushConstants);
-    if let Some(slot) = slot {
-        cmd_buf.push_render_constants(
-            slot.index, gfx::num_32bit_constants(&world_buffer_info), 0, gfx::as_u8_slice(&world_buffer_info));
-    }
+    cmd_buf.push_render_constants(
+        pipeline, 2, 0, gfx::num_32bit_constants(&world_buffer_info), 0, gfx::as_u8_slice(&world_buffer_info));
 
     // bind the shader resource heap
     cmd_buf.set_heap(pipeline, &pmfx.shader_heap);
@@ -208,10 +202,7 @@ pub fn render_meshes_bindless_ibl(
 
     // single draw calls
     for (mesh, world_matrix) in &single_draw_query {
-        let slot = pipeline.get_pipeline_slot(1, 0, gfx::DescriptorType::PushConstants);
-        if let Some(slot) = slot {
-            cmd_buf.push_render_constants(slot.index, 12, 0, &world_matrix.0);
-        }
+        cmd_buf.push_render_constants(pipeline, 1, 0, 12, 0, &world_matrix.0);
         cmd_buf.set_index_buffer(&mesh.0.ib);
         cmd_buf.set_vertex_buffer(&mesh.0.vb, 0);
         cmd_buf.draw_indexed_instanced(mesh.0.num_indices, 1, 0, 0, 0);

plugins/ecs_examples/src/bindless_texture.rs

@@ -156,13 +156,13 @@ pub fn draw_meshes_bindless_texture(
     let camera = pmfx.get_camera_constants(&view.camera)?;
 
     cmd_buf.set_render_pipeline(pipeline);
-    cmd_buf.push_render_constants(0, 16, 0, gfx::as_u8_slice(&camera.view_projection_matrix));
+    cmd_buf.push_render_constants(pipeline, 0, 0, 16, 0, gfx::as_u8_slice(&camera.view_projection_matrix));
 
     cmd_buf.set_heap(pipeline, &pmfx.shader_heap);
 
     for (world_matrix, mesh, texture) in &mesh_draw_query {
-        cmd_buf.push_render_constants(1, 12, 0, &world_matrix.0);
-        cmd_buf.push_render_constants(1, 1, 16, gfx::as_u8_slice(&texture.0));
+        cmd_buf.push_render_constants(pipeline, 1, 0, 12, 0, &world_matrix.0);
+        cmd_buf.push_render_constants(pipeline, 1, 0, 1, 16, gfx::as_u8_slice(&texture.0));
 
         cmd_buf.set_index_buffer(&mesh.0.ib);
         cmd_buf.set_vertex_buffer(&mesh.0.vb, 0);

plugins/ecs_examples/src/blend_states.rs

@@ -113,9 +113,9 @@ pub fn render_meshes_pipeline_coloured(
         // set pipeline per mesh
         let pipeline = pmfx.get_render_pipeline_for_format(&pipeline.0, fmt)?;
         cmd_buf.set_render_pipeline(pipeline);
-        cmd_buf.push_render_constants(0, 16, 0, gfx::as_u8_slice(&camera.view_projection_matrix));
-        cmd_buf.push_render_constants(1, 12, 0, &world_matrix.0);
-        cmd_buf.push_render_constants(1, 4, 12, &colour.0);
+        cmd_buf.push_render_constants(pipeline, 0, 0, 16, 0, gfx::as_u8_slice(&camera.view_projection_matrix));
+        cmd_buf.push_render_constants(pipeline, 1, 0, 12, 0, &world_matrix.0);
+        cmd_buf.push_render_constants(pipeline, 1, 0, 4, 12, &colour.0);
 
         cmd_buf.set_index_buffer(&mesh.0.ib);
         cmd_buf.set_vertex_buffer(&mesh.0.vb, 0);

plugins/ecs_examples/src/cubemap.rs

@@ -73,14 +73,14 @@ pub fn render_meshes_cubemap(
     let camera = pmfx.get_camera_constants(&view.camera)?;
 
     cmd_buf.set_render_pipeline(pipeline);
-    cmd_buf.push_render_constants(0, 16, 0, gfx::as_u8_slice(&camera.view_projection_matrix));
+    cmd_buf.push_render_constants(pipeline, 0, 0, 16, 0, gfx::as_u8_slice(&camera.view_projection_matrix));
 
     cmd_buf.set_heap(pipeline, &pmfx.shader_heap);
 
     let mut mip = 0;
     for (world_matrix, mesh, cubemap) in &mesh_draw_query {
-        cmd_buf.push_render_constants(1, 12, 0, &world_matrix.0);
-        cmd_buf.push_render_constants(1, 2, 16, gfx::as_u8_slice(&[cubemap.0, mip, 0, 0]));
+        cmd_buf.push_render_constants(pipeline, 1, 0, 12, 0, &world_matrix.0);
+        cmd_buf.push_render_constants(pipeline, 1, 0, 2, 16, gfx::as_u8_slice(&[cubemap.0, mip, 0, 0]));
 
         cmd_buf.set_index_buffer(&mesh.0.ib);
         cmd_buf.set_vertex_buffer(&mesh.0.vb, 0);

plugins/ecs_examples/src/draw.rs

@@ -80,7 +80,7 @@ pub fn draw_meshes(
     let camera = pmfx.get_camera_constants(&view.camera)?;
 
     cmd_buf.set_render_pipeline(pipeline);
-    cmd_buf.push_render_constants(0, 16, 0, gfx::as_u8_slice(&camera.view_projection_matrix));
+    cmd_buf.push_render_constants(pipeline, 0, 0, 16, 0, gfx::as_u8_slice(&camera.view_projection_matrix));
 
     for (_, mesh) in &mesh_draw_query {
         cmd_buf.set_vertex_buffer(&mesh.0.vb, 0);

plugins/ecs_examples/src/draw_cbuffer_instanced.rs

@@ -104,7 +104,7 @@ pub fn draw_meshes_cbuffer_instanced(
         // set pipeline per batch
         let pipeline = pmfx.get_render_pipeline_for_format(&pipeline.0, fmt)?;
         cmd_buf.set_render_pipeline(pipeline);
-        cmd_buf.push_render_constants(0, 16, 0, gfx::as_u8_slice(&camera.view_projection_matrix));
+        cmd_buf.push_render_constants(pipeline, 0, 0, 16, 0, gfx::as_u8_slice(&camera.view_projection_matrix));
 
         // bind the constant buffer (cbv) on the slot for b1, space0 specified in the shader
         cmd_buf.set_binding(

plugins/ecs_examples/src/draw_indexed.rs

@@ -50,7 +50,7 @@ pub fn draw_meshes_indexed(
     let camera = pmfx.get_camera_constants(&view.camera)?;
 
     cmd_buf.set_render_pipeline(pipeline);
-    cmd_buf.push_render_constants(0, 16, 0, gfx::as_u8_slice(&camera.view_projection_matrix));
+    cmd_buf.push_render_constants(pipeline, 0, 0, 16, 0, gfx::as_u8_slice(&camera.view_projection_matrix));
 
     for (_, mesh) in &mesh_draw_query {
         cmd_buf.set_vertex_buffer(&mesh.0.vb, 0);