u64 instead of u16

Author: atlv24

wgpu-core/src/command/bundle.rs

@@ -1325,7 +1325,7 @@ struct State {
     texture_memory_init_actions: Vec<TextureInitTrackerAction>,
     next_dynamic_offset: usize,
     binder: Binder,
-    immediate_slots_set: u16,
+    immediate_slots_set: u64,
 }
 
 impl State {

wgpu-core/src/command/compute.rs

@@ -129,8 +129,8 @@ pub enum DispatchError {
     InvalidGroupSize { current: [u32; 3], limit: u32 },
     #[error(transparent)]
     BindingSizeTooSmall(#[from] LateMinBufferBindingSizeMismatch),
-    #[error("Not all immediate data slots required by the pipeline have been set (required: 0x{required:04X}, set: 0x{set:04X})")]
-    MissingImmediateData { required: u16, set: u16 },
+    #[error("Not all immediate data slots required by the pipeline have been set (required: 0x{required:016X}, set: 0x{set:016X})")]
+    MissingImmediateData { required: u64, set: u64 },
 }
 
 impl WebGpuError for DispatchError {
@@ -264,7 +264,7 @@ struct State<'scope, 'snatch_guard, 'cmd_enc> {
 
     immediates: Vec<u32>,
 
-    immediate_slots_set: u16,
+    immediate_slots_set: u64,
 
     intermediate_trackers: Tracker,
 }

wgpu-core/src/command/draw.rs

@@ -75,8 +75,8 @@ pub enum DrawError {
         highest_view_index: u32,
         max_multiviews: u32,
     },
-    #[error("Not all immediate data slots required by the pipeline have been set (required: 0x{required:04X}, set: 0x{set:04X})")]
-    MissingImmediateData { required: u16, set: u16 },
+    #[error("Not all immediate data slots required by the pipeline have been set (required: 0x{required:016X}, set: 0x{set:016X})")]
+    MissingImmediateData { required: u64, set: u64 },
 }
 
 impl WebGpuError for DrawError {

wgpu-core/src/command/render.rs

@@ -528,7 +528,7 @@ struct State<'scope, 'snatch_guard, 'cmd_enc> {
 
     pass: pass::PassState<'scope, 'snatch_guard, 'cmd_enc>,
 
-    immediate_slots_set: u16,
+    immediate_slots_set: u64,
 
     active_occlusion_query: Option<(Arc<QuerySet>, u32)>,
     active_pipeline_statistics_query: Option<(Arc<QuerySet>, u32)>,

wgpu-core/src/device/resource.rs

@@ -4773,7 +4773,7 @@ impl Device {
             .iter()
             .filter_map(|sm| sm.interface.as_ref())
             .map(|i| i.immediate_slots_required)
-            .fold(0u16, core::ops::BitOr::bitor);
+            .fold(0u64, core::ops::BitOr::bitor);
 
         let pipeline = pipeline::RenderPipeline {
             raw: ManuallyDrop::new(raw),

wgpu-core/src/immediates.rs

@@ -1,7 +1,7 @@
 /// Returns the bitmask of slots covered by a `set_immediates(offset, size_bytes)` call.
-pub(crate) fn slots_for_range(offset: u32, size_bytes: u32) -> u16 {
-    // u32 upcast to avoid overflow panic on n = 16
-    let bits_below = |n: u32| ((1u32 << n.min(16)) - 1) as u16;
+pub(crate) fn slots_for_range(offset: u32, size_bytes: u32) -> u64 {
+    // u128 upcast to avoid overflow panic on n = 64
+    let bits_below = |n: u32| ((1u128 << n.min(64)) - 1) as u64;
     let lo = offset / 4;
     let hi = (offset + size_bytes).div_ceil(4);
     bits_below(hi) - bits_below(lo)
@@ -13,10 +13,10 @@ pub(crate) fn slots_for_range(offset: u32, size_bytes: u32) -> u16 {
 /// For structs, gaps between members are padding and those slots need not be set.
 /// For scalars, vectors, and matrices, all slots in the span are required
 /// (the spec only defines padding exemptions at the struct-member level).
-pub(crate) fn slots_for_type(ty: &naga::TypeInner, gctx: naga::proc::GlobalCtx) -> u16 {
+pub(crate) fn slots_for_type(ty: &naga::TypeInner, gctx: naga::proc::GlobalCtx) -> u64 {
     match *ty {
         naga::TypeInner::Struct { ref members, .. } => {
-            let mut mask: u16 = 0;
+            let mut mask: u64 = 0;
             for member in members {
                 let member_size = gctx.types[member.ty].inner.size(gctx);
                 mask |= slots_for_range(member.offset, member_size);
@@ -41,7 +41,7 @@ fn immediate_type(module: &naga::Module) -> Option<&naga::TypeInner> {
 
 /// Returns the required immediate slot bitmask for a naga module.
 /// Zero if the module has no `var<immediate>`.
-pub(crate) fn slots_for_module(module: &naga::Module) -> u16 {
+pub(crate) fn slots_for_module(module: &naga::Module) -> u64 {
     immediate_type(module).map_or(0, |ty| slots_for_type(ty, module.to_ctx()))
 }
 
@@ -56,7 +56,7 @@ pub(crate) fn size_for_module(module: &naga::Module) -> u32 {
 mod tests {
     use super::slots_for_module;
 
-    fn immediate_slots(wgsl: &str) -> u16 {
+    fn immediate_slots(wgsl: &str) -> u64 {
         slots_for_module(&naga::front::wgsl::parse_str(wgsl).unwrap())
     }
 

wgpu-core/src/pipeline.rs

@@ -278,7 +278,7 @@ pub struct ComputePipeline {
     pub(crate) device: Arc<Device>,
     pub(crate) _shader_module: Arc<ShaderModule>,
     pub(crate) late_sized_buffer_groups: ArrayVec<LateSizedBufferGroup, { hal::MAX_BIND_GROUPS }>,
-    pub(crate) immediate_slots_required: u16,
+    pub(crate) immediate_slots_required: u64,
     /// The `label` from the descriptor used to create the resource.
     pub(crate) label: String,
     pub(crate) tracking_data: TrackingData,
@@ -816,7 +816,7 @@ pub struct RenderPipeline {
     pub(crate) strip_index_format: Option<wgt::IndexFormat>,
     pub(crate) vertex_steps: Vec<VertexStep>,
     pub(crate) late_sized_buffer_groups: ArrayVec<LateSizedBufferGroup, { hal::MAX_BIND_GROUPS }>,
-    pub(crate) immediate_slots_required: u16,
+    pub(crate) immediate_slots_required: u64,
     /// The `label` from the descriptor used to create the resource.
     pub(crate) label: String,
     pub(crate) tracking_data: TrackingData,

wgpu-core/src/validation.rs

@@ -299,7 +299,7 @@ pub struct Interface {
     limits: wgt::Limits,
     resources: naga::Arena<Resource>,
     entry_points: FastHashMap<(naga::ShaderStage, String), EntryPoint>,
-    pub(crate) immediate_slots_required: u16,
+    pub(crate) immediate_slots_required: u64,
     pub(crate) immediate_size: u32,
 }