[remove] pipeline stages from being used when setting immediates as they're no longer required by wgpu.

Author: vmarcella

crates/lambda-rs-platform/src/wgpu/pipeline.rs

@@ -15,7 +15,7 @@ use crate::wgpu::{
   vertex::ColorFormat,
 };
 
-/// Shader stage flags for immediate data and visibility.
+/// Shader stage flags for visibility.
 #[derive(Clone, Copy, Debug)]
 ///
 /// This wrapper avoids exposing `wgpu` directly to higher layers while still
@@ -51,10 +51,9 @@ impl std::ops::BitOrAssign for PipelineStage {
   }
 }
 
-/// Immediate data declaration for a stage and byte range.
+/// Immediate data declaration for a byte range.
 #[derive(Clone, Debug)]
 pub struct ImmediateDataRange {
-  pub stages: PipelineStage,
   pub range: Range<u32>,
 }
 
@@ -336,7 +335,7 @@ impl<'a> PipelineLayoutBuilder<'a> {
     return self;
   }
 
-  /// Provide immediate data ranges for shader stages.
+  /// Provide immediate data byte ranges.
   pub fn with_immediate_data_ranges(
     mut self,
     ranges: Vec<ImmediateDataRange>,
@@ -402,7 +401,6 @@ mod immediate_size_tests {
   use super::{
     validate_and_calculate_immediate_size,
     ImmediateDataRange,
-    PipelineStage,
   };
 
   #[test]
@@ -414,14 +412,8 @@ mod immediate_size_tests {
   #[test]
   fn immediate_size_overlapping_ranges_ok() {
     let ranges = vec![
-      ImmediateDataRange {
-        stages: PipelineStage::VERTEX,
-        range: 0..64,
-      },
-      ImmediateDataRange {
-        stages: PipelineStage::FRAGMENT,
-        range: 0..32,
-      },
+      ImmediateDataRange { range: 0..64 },
+      ImmediateDataRange { range: 0..32 },
     ];
     let size = validate_and_calculate_immediate_size(&ranges).unwrap();
     assert_eq!(size, 64);
@@ -430,14 +422,8 @@ mod immediate_size_tests {
   #[test]
   fn immediate_size_contiguous_ranges_ok() {
     let ranges = vec![
-      ImmediateDataRange {
-        stages: PipelineStage::VERTEX,
-        range: 0..16,
-      },
-      ImmediateDataRange {
-        stages: PipelineStage::FRAGMENT,
-        range: 16..32,
-      },
+      ImmediateDataRange { range: 0..16 },
+      ImmediateDataRange { range: 16..32 },
     ];
     let size = validate_and_calculate_immediate_size(&ranges).unwrap();
     assert_eq!(size, 32);
@@ -446,25 +432,16 @@ mod immediate_size_tests {
   #[test]
   fn immediate_size_gap_is_error() {
     let ranges = vec![
-      ImmediateDataRange {
-        stages: PipelineStage::VERTEX,
-        range: 0..16,
-      },
-      ImmediateDataRange {
-        stages: PipelineStage::FRAGMENT,
-        range: 32..48,
-      },
+      ImmediateDataRange { range: 0..16 },
+      ImmediateDataRange { range: 32..48 },
     ];
     let err = validate_and_calculate_immediate_size(&ranges).unwrap_err();
     assert!(err.contains("gap"));
   }
 
   #[test]
   fn immediate_size_non_zero_start_is_error() {
-    let ranges = vec![ImmediateDataRange {
-      stages: PipelineStage::VERTEX,
-      range: 16..32,
-    }];
+    let ranges = vec![ImmediateDataRange { range: 16..32 }];
     let err = validate_and_calculate_immediate_size(&ranges).unwrap_err();
     assert!(err.contains("gap"));
   }

crates/lambda-rs/examples/immediates.rs

@@ -16,10 +16,7 @@ use lambda::{
       Mesh,
       MeshBuilder,
     },
-    pipeline::{
-      PipelineStage,
-      RenderPipelineBuilder,
-    },
+    pipeline::RenderPipelineBuilder,
     render_pass::RenderPassBuilder,
     scene_math::{
       compute_model_view_projection_matrix_about_pivot,
@@ -192,7 +189,7 @@ impl Component<ComponentResult, String> for ImmediatesExample {
 
     let pipeline = RenderPipelineBuilder::new()
       .with_culling(lambda::render::pipeline::CullingMode::None)
-      .with_immediate_data(PipelineStage::VERTEX, immediate_data_size)
+      .with_immediate_data(immediate_data_size)
       .with_buffer(
         BufferBuilder::build_from_mesh(&mesh, render_context.gpu())
           .expect("Failed to create buffer"),
@@ -305,7 +302,6 @@ impl Component<ComponentResult, String> for ImmediatesExample {
       },
       RenderCommand::Immediates {
         pipeline: render_pipeline.clone(),
-        stage: PipelineStage::VERTEX,
         offset: 0,
         bytes: Vec::from(immediate_data_to_bytes(&ImmediateData {
           data: [0.0, 0.0, 0.0, 0.0],

crates/lambda-rs/examples/reflective_room.rs

@@ -31,7 +31,6 @@ use lambda::{
     pipeline::{
       CompareFunction,
       CullingMode,
-      PipelineStage,
       RenderPipelineBuilder,
       StencilFaceState,
       StencilOperation,
@@ -408,7 +407,6 @@ impl Component<ComponentResult, String> for ReflectiveRoomExample {
         });
         cmds.push(RenderCommand::Immediates {
           pipeline: pipe_floor_mask,
-          stage: PipelineStage::VERTEX,
           offset: 0,
           bytes: Vec::from(immediate_data_to_words(&ImmediateData {
             mvp: mvp_floor.transpose(),
@@ -442,7 +440,6 @@ impl Component<ComponentResult, String> for ReflectiveRoomExample {
         });
         cmds.push(RenderCommand::Immediates {
           pipeline: pipe_reflected,
-          stage: PipelineStage::VERTEX,
           offset: 0,
           bytes: Vec::from(immediate_data_to_words(&ImmediateData {
             mvp: mvp_reflect.transpose(),
@@ -469,7 +466,6 @@ impl Component<ComponentResult, String> for ReflectiveRoomExample {
       });
       cmds.push(RenderCommand::Immediates {
         pipeline: pipe_floor_visual,
-        stage: PipelineStage::VERTEX,
         offset: 0,
         bytes: Vec::from(immediate_data_to_words(&ImmediateData {
           mvp: mvp_floor.transpose(),
@@ -493,7 +489,6 @@ impl Component<ComponentResult, String> for ReflectiveRoomExample {
     });
     cmds.push(RenderCommand::Immediates {
       pipeline: pipe_normal,
-      stage: PipelineStage::VERTEX,
       offset: 0,
       bytes: Vec::from(immediate_data_to_words(&ImmediateData {
         mvp: mvp.transpose(),
@@ -625,7 +620,7 @@ impl ReflectiveRoomExample {
         .with_depth_format(DepthFormat::Depth24PlusStencil8)
         .with_depth_write(false)
         .with_depth_compare(CompareFunction::Always)
-        .with_immediate_data(PipelineStage::VERTEX, immediate_data_size)
+        .with_immediate_data(immediate_data_size)
         .with_buffer(
           BufferBuilder::new()
             .with_length(
@@ -677,7 +672,7 @@ impl ReflectiveRoomExample {
         // Mirrored transform reverses winding; cull front to keep visible faces.
         .with_culling(CullingMode::Front)
         .with_depth_format(DepthFormat::Depth24PlusStencil8)
-        .with_immediate_data(PipelineStage::VERTEX, immediate_data_size)
+        .with_immediate_data(immediate_data_size)
         .with_buffer(
           BufferBuilder::new()
             .with_length(
@@ -730,7 +725,7 @@ impl ReflectiveRoomExample {
     let mut floor_builder = RenderPipelineBuilder::new()
       .with_label("floor-visual")
       .with_culling(CullingMode::Back)
-      .with_immediate_data(PipelineStage::VERTEX, immediate_data_size)
+      .with_immediate_data(immediate_data_size)
       .with_buffer(
         BufferBuilder::new()
           .with_length(
@@ -768,7 +763,7 @@ impl ReflectiveRoomExample {
     let mut normal_builder = RenderPipelineBuilder::new()
       .with_label("cube-normal")
       .with_culling(CullingMode::Back)
-      .with_immediate_data(PipelineStage::VERTEX, immediate_data_size)
+      .with_immediate_data(immediate_data_size)
       .with_buffer(
         BufferBuilder::new()
           .with_length(

crates/lambda-rs/examples/textured_cube.rs

@@ -20,10 +20,7 @@ use lambda::{
       Mesh,
       MeshBuilder,
     },
-    pipeline::{
-      PipelineStage,
-      RenderPipelineBuilder,
-    },
+    pipeline::RenderPipelineBuilder,
     render_pass::RenderPassBuilder,
     scene_math::{
       compute_perspective_projection,
@@ -334,7 +331,7 @@ impl Component<ComponentResult, String> for TexturedCubeExample {
     let pipeline = RenderPipelineBuilder::new()
       .with_culling(lambda::render::pipeline::CullingMode::Back)
       .with_depth()
-      .with_immediate_data(PipelineStage::VERTEX, immediate_data_size)
+      .with_immediate_data(immediate_data_size)
       .with_buffer(
         BufferBuilder::build_from_mesh(&mesh, render_context.gpu())
           .expect("Failed to create vertex buffer"),
@@ -462,7 +459,6 @@ impl Component<ComponentResult, String> for TexturedCubeExample {
       },
       RenderCommand::Immediates {
         pipeline,
-        stage: PipelineStage::VERTEX,
         offset: 0,
         bytes: Vec::from(immediate_data_to_bytes(&ImmediateData {
           mvp: mvp.transpose(),

crates/lambda-rs/examples/triangles.rs

@@ -11,7 +11,6 @@ use lambda::{
     command::RenderCommand,
     pipeline::{
       self,
-      PipelineStage,
     },
     render_pass,
     shader::{
@@ -55,7 +54,7 @@ impl Component<ComponentResult, String> for TrianglesComponent {
     let immediate_data_size = std::mem::size_of::<ImmediateData>() as u32;
     let pipeline = pipeline::RenderPipelineBuilder::new()
       .with_culling(pipeline::CullingMode::None)
-      .with_immediate_data(PipelineStage::VERTEX, immediate_data_size)
+      .with_immediate_data(immediate_data_size)
       .build(
         render_context.gpu(),
         render_context.surface_format(),
@@ -146,7 +145,6 @@ impl Component<ComponentResult, String> for TrianglesComponent {
     for triangle in triangle_data {
       commands.push(RenderCommand::Immediates {
         pipeline: render_pipeline.clone(),
-        stage: PipelineStage::VERTEX,
         offset: 0,
         bytes: Vec::from(immediate_data_to_bytes(triangle)),
       });

crates/lambda-rs/src/render/command.rs

@@ -7,10 +7,7 @@
 
 use std::ops::Range;
 
-use super::{
-  pipeline::PipelineStage,
-  viewport::Viewport,
-};
+use super::viewport::Viewport;
 
 /// Engine-level index format for indexed drawing.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -88,7 +85,6 @@ pub enum RenderCommand {
   /// immediate data blocks remains `layout(push_constant)`.
   Immediates {
     pipeline: super::ResourceId,
-    stage: PipelineStage,
     offset: u32,
     bytes: Vec<u32>,
   },

crates/lambda-rs/src/render/mod.rs

@@ -909,7 +909,6 @@ impl RenderContext {
         }
         RenderCommand::Immediates {
           pipeline,
-          stage: _,
           offset,
           bytes,
         } => {

crates/lambda-rs/src/render/pipeline.rs

@@ -16,19 +16,16 @@
 //! Example
 //! ```rust,ignore
 //! // Single vertex buffer with position/color; one immediate data range for the vertex stage
-//! use lambda::render::pipeline::{RenderPipelineBuilder, PipelineStage, CullingMode};
+//! use lambda::render::pipeline::{RenderPipelineBuilder, CullingMode};
 //! let pipeline = RenderPipelineBuilder::new()
 //!   .with_buffer(vertex_buffer, attributes)
-//!   .with_immediate_data(PipelineStage::VERTEX, 64)
+//!   .with_immediate_data(64)
 //!   .with_layouts(&[&globals_bgl])
 //!   .with_culling(CullingMode::Back)
 //!   .build(&mut render_context, &render_pass, &vs, Some(&fs));
 //! ```
 
-use std::{
-  ops::Range,
-  rc::Rc,
-};
+use std::rc::Rc;
 
 use lambda_platform::wgpu::pipeline as platform_pipeline;
 use logging;
@@ -116,12 +113,12 @@ impl RenderPipeline {
   }
 }
 
-/// Public alias for platform shader stage flags used by immediate data.
+/// Public alias for platform shader stage flags.
+///
+/// Stage flags remain useful for APIs such as bind group visibility, even
+/// though wgpu v28 immediates no longer use stage-scoped updates.
 pub use platform_pipeline::PipelineStage;
 
-/// Convenience alias for uploading immediate data: stage and byte range.
-pub type ImmediateDataUpload = (PipelineStage, Range<u32>);
-
 struct BufferBinding {
   buffer: Rc<Buffer>,
   layout: VertexBufferLayout,
@@ -260,7 +257,7 @@ pub struct StencilState {
 /// - If a fragment shader is omitted, no color target is attached and the
 ///   pipeline can still be used for vertex‑only workloads.
 pub struct RenderPipelineBuilder {
-  immediate_data: Vec<ImmediateDataUpload>,
+  immediate_data: Vec<std::ops::Range<u32>>,
   bindings: Vec<BufferBinding>,
   culling: CullingMode,
   bind_group_layouts: Vec<bind::BindGroupLayout>,
@@ -346,13 +343,14 @@ impl RenderPipelineBuilder {
     );
   }
 
-  /// Declare an immediate data range for a shader stage in bytes.
-  pub fn with_immediate_data(
-    mut self,
-    stage: PipelineStage,
-    bytes: u32,
-  ) -> Self {
-    self.immediate_data.push((stage, 0..bytes));
+  /// Declare an immediate data byte range size.
+  ///
+  /// wgpu v28 uses a single immediate data region sized by the pipeline
+  /// layout. This method records a range starting at 0 whose end defines the
+  /// required allocation size. Multiple calls are allowed; the final
+  /// allocation is derived from the union of ranges.
+  pub fn with_immediate_data(mut self, bytes: u32) -> Self {
+    self.immediate_data.push(0..bytes);
     return self;
   }
 
@@ -469,8 +467,7 @@ impl RenderPipelineBuilder {
       self
         .immediate_data
         .iter()
-        .map(|(stage, range)| platform_pipeline::ImmediateDataRange {
-          stages: *stage,
+        .map(|range| platform_pipeline::ImmediateDataRange {
           range: range.clone(),
         })
         .collect();