Storage indexing

Author: kvark

src/command/compute.rs

@@ -38,8 +38,7 @@ pub extern "C" fn wgpu_compute_pass_end_pass(pass_id: ComputePassId) -> CommandB
 
     HUB.command_buffers
         .write()
-        .get_mut(pass.cmb_id.value)
-        .raw
+        [pass.cmb_id.value].raw
         .push(pass.raw);
     pass.cmb_id.value
 }
@@ -49,8 +48,7 @@ pub extern "C" fn wgpu_compute_pass_dispatch(pass_id: ComputePassId, x: u32, y:
     unsafe {
         HUB.compute_passes
             .write()
-            .get_mut(pass_id)
-            .raw
+            [pass_id].raw
             .dispatch([x, y, z]);
     }
 }
@@ -62,9 +60,9 @@ pub extern "C" fn wgpu_compute_pass_set_bind_group(
     bind_group_id: BindGroupId,
 ) {
     let mut pass_guard = HUB.compute_passes.write();
-    let pass = pass_guard.get_mut(pass_id);
+    let pass = &mut pass_guard[pass_id];
     let bind_group_guard = HUB.bind_groups.read();
-    let bind_group = bind_group_guard.get(bind_group_id);
+    let bind_group = &bind_group_guard[bind_group_id];
 
     //Note: currently, WebGPU compute passes have synchronization defined
     // at a dispatch granularity, so we insert the necessary barriers here.
@@ -81,10 +79,9 @@ pub extern "C" fn wgpu_compute_pass_set_bind_group(
 
     if let Some(pipeline_layout_id) = pass.binder.provide_entry(index as usize, bind_group_id, bind_group) {
         let pipeline_layout_guard = HUB.pipeline_layouts.read();
-        let pipeline_layout = pipeline_layout_guard.get(pipeline_layout_id);
         unsafe {
             pass.raw.bind_compute_descriptor_sets(
-                &pipeline_layout.raw,
+                &pipeline_layout_guard[pipeline_layout_id].raw,
                 index as usize,
                 iter::once(&bind_group.raw),
                 &[],
@@ -99,9 +96,9 @@ pub extern "C" fn wgpu_compute_pass_set_pipeline(
     pipeline_id: ComputePipelineId,
 ) {
     let mut pass_guard = HUB.compute_passes.write();
-    let pass = pass_guard.get_mut(pass_id);
+    let pass = &mut pass_guard[pass_id];
     let pipeline_guard = HUB.compute_pipelines.read();
-    let pipeline = pipeline_guard.get(pipeline_id);
+    let pipeline = &pipeline_guard[pipeline_id];
 
     unsafe {
         pass.raw.bind_compute_pipeline(&pipeline.raw);
@@ -112,7 +109,7 @@ pub extern "C" fn wgpu_compute_pass_set_pipeline(
     }
 
     let pipeline_layout_guard = HUB.pipeline_layouts.read();
-    let pipeline_layout = pipeline_layout_guard.get(pipeline.layout_id);
+    let pipeline_layout = &pipeline_layout_guard[pipeline.layout_id];
     let bing_group_guard = HUB.bind_groups.read();
 
     pass.binder.pipeline_layout_id = Some(pipeline.layout_id.clone());
@@ -124,12 +121,12 @@ pub extern "C" fn wgpu_compute_pass_set_pipeline(
         .enumerate()
     {
         if let Some(bg_id) = entry.expect_layout(bgl_id) {
-            let bind_group = bing_group_guard.get(bg_id);
+            let desc_set = &bing_group_guard[bg_id].raw;
             unsafe {
                 pass.raw.bind_compute_descriptor_sets(
                     &pipeline_layout.raw,
                     index,
-                    iter::once(&bind_group.raw),
+                    iter::once(desc_set),
                     &[]
                 );
             }

src/command/mod.rs

@@ -102,7 +102,7 @@ impl CommandBufferHandle {
     {
 
         let buffer_barriers = buffer_iter.map(|(id, transit)| {
-            let b = buffer_guard.get(id);
+            let b = &buffer_guard[id];
             trace!("transit {:?} {:?}", id, transit);
             hal::memory::Barrier::Buffer {
                 states: conv::map_buffer_state(transit.start) .. conv::map_buffer_state(transit.end),
@@ -112,7 +112,7 @@ impl CommandBufferHandle {
             }
         });
         let texture_barriers = texture_iter.map(|(id, transit)| {
-            let t = texture_guard.get(id);
+            let t = &texture_guard[id];
             trace!("transit {:?} {:?}", id, transit);
             let aspects = t.full_range.aspects;
             hal::memory::Barrier::Image {
@@ -148,7 +148,7 @@ pub extern "C" fn wgpu_command_encoder_finish(
 ) -> CommandBufferId {
     HUB.command_buffers
         .write()
-        .get_mut(command_encoder_id)
+        [command_encoder_id]
         .is_recording = false; //TODO: check for the old value
     command_encoder_id
 }
@@ -158,9 +158,9 @@ pub fn command_encoder_begin_render_pass(
     desc: RenderPassDescriptor,
 ) -> RenderPass<Backend> {
     let mut cmb_guard = HUB.command_buffers.write();
-    let cmb = cmb_guard.get_mut(command_encoder_id);
+    let cmb = &mut cmb_guard[command_encoder_id];
     let device_guard = HUB.devices.read();
-    let device = device_guard.get(cmb.device_id.value);
+    let device = &device_guard[cmb.device_id.value];
     let view_guard = HUB.texture_views.read();
 
     let mut current_comb = device.com_allocator.extend(cmb);
@@ -187,7 +187,7 @@ pub fn command_encoder_begin_render_pass(
         let swap_chain_links = &mut cmb.swap_chain_links;
 
         let depth_stencil_key = depth_stencil_attachment.map(|at| {
-            let view = view_guard.get(at.attachment);
+            let view = &view_guard[at.attachment];
             if let Some(ex) = extent {
                 assert_eq!(ex, view.extent);
             } else {
@@ -213,13 +213,12 @@ pub fn command_encoder_begin_render_pass(
         });
 
         let color_keys = color_attachments.iter().map(|at| {
-            let view = view_guard.get(at.attachment);
+            let view = &view_guard[at.attachment];
 
             if view.is_owned_by_swap_chain {
                 let link = match HUB.textures
                     .read()
-                    .get(view.texture_id.value)
-                    .swap_chain_link
+                    [view.texture_id.value].swap_chain_link
                 {
                     Some(ref link) => SwapChainLink {
                         swap_chain_id: link.swap_chain_id.clone(),
@@ -308,7 +307,7 @@ pub fn command_encoder_begin_render_pass(
                     .key()
                     .attachments
                     .iter()
-                    .map(|&id| &view_guard.get(id).raw);
+                    .map(|&id| &view_guard[id].raw);
 
                 unsafe {
                     device
@@ -381,7 +380,7 @@ pub fn command_encoder_begin_compute_pass(
     command_encoder_id: CommandEncoderId,
 ) -> ComputePass<Backend> {
     let mut cmb_guard = HUB.command_buffers.write();
-    let cmb = cmb_guard.get_mut(command_encoder_id);
+    let cmb = &mut cmb_guard[command_encoder_id];
 
     let raw = cmb.raw.pop().unwrap();
     let stored = Stored {

src/command/render.rs

@@ -38,7 +38,7 @@ pub extern "C" fn wgpu_render_pass_end_pass(pass_id: RenderPassId) -> CommandBuf
     }
 
     let mut cmb_guard = HUB.command_buffers.write();
-    let cmb = cmb_guard.get_mut(pass.cmb_id.value);
+    let cmb = &mut cmb_guard[pass.cmb_id.value];
 
     match cmb.raw.last_mut() {
         Some(ref mut last) => {
@@ -73,7 +73,7 @@ pub extern "C" fn wgpu_render_pass_set_index_buffer(
     let mut pass_guard = HUB.render_passes.write();
     let buffer_guard = HUB.buffers.read();
 
-    let pass = pass_guard.get_mut(pass_id);
+    let pass = &mut pass_guard[pass_id];
     let buffer = pass.trackers.buffers
         .get_with_extended_usage(
             &*buffer_guard,
@@ -109,7 +109,7 @@ pub extern "C" fn wgpu_render_pass_set_vertex_buffers(
         slice::from_raw_parts(offset_ptr, count)
     };
 
-    let pass = pass_guard.get_mut(pass_id);
+    let pass = &mut pass_guard[pass_id];
     for &id in buffers {
         pass.trackers.buffers
             .get_with_extended_usage(
@@ -122,7 +122,7 @@ pub extern "C" fn wgpu_render_pass_set_vertex_buffers(
 
     let buffers = buffers
         .iter()
-        .map(|&id| &buffer_guard.get(id).raw)
+        .map(|&id| &buffer_guard[id].raw)
         .zip(offsets.iter().map(|&off| off as u64));
 
     unsafe {
@@ -141,8 +141,7 @@ pub extern "C" fn wgpu_render_pass_draw(
     unsafe {
         HUB.render_passes
             .write()
-            .get_mut(pass_id)
-            .raw
+            [pass_id].raw
             .draw(
                 first_vertex .. first_vertex + vertex_count,
                 first_instance .. first_instance + instance_count,
@@ -162,8 +161,7 @@ pub extern "C" fn wgpu_render_pass_draw_indexed(
     unsafe {
         HUB.render_passes
             .write()
-            .get_mut(pass_id)
-            .raw
+            [pass_id].raw
             .draw_indexed(
                 first_index .. first_index + index_count,
                 base_vertex,
@@ -179,9 +177,9 @@ pub extern "C" fn wgpu_render_pass_set_bind_group(
     bind_group_id: BindGroupId,
 ) {
     let mut pass_guard = HUB.render_passes.write();
-    let pass = pass_guard.get_mut(pass_id);
+    let pass = &mut pass_guard[pass_id];
     let bind_group_guard = HUB.bind_groups.read();
-    let bind_group = bind_group_guard.get(bind_group_id);
+    let bind_group = &bind_group_guard[bind_group_id];
 
     pass.trackers.buffers
         .consume_by_extend(&bind_group.used.buffers)
@@ -193,7 +191,7 @@ pub extern "C" fn wgpu_render_pass_set_bind_group(
 
     if let Some(pipeline_layout_id) = pass.binder.provide_entry(index as usize, bind_group_id, bind_group) {
         let pipeline_layout_guard = HUB.pipeline_layouts.read();
-        let pipeline_layout = pipeline_layout_guard.get(pipeline_layout_id);
+        let pipeline_layout = &pipeline_layout_guard[pipeline_layout_id];
         unsafe {
             pass.raw.bind_graphics_descriptor_sets(
                 &pipeline_layout.raw,
@@ -211,9 +209,9 @@ pub extern "C" fn wgpu_render_pass_set_pipeline(
     pipeline_id: RenderPipelineId,
 ) {
     let mut pass_guard = HUB.render_passes.write();
-    let pass = pass_guard.get_mut(pass_id);
+    let pass = &mut pass_guard[pass_id];
     let pipeline_guard = HUB.render_pipelines.read();
-    let pipeline = pipeline_guard.get(pipeline_id);
+    let pipeline = &pipeline_guard[pipeline_id];
 
     unsafe {
         pass.raw.bind_graphics_pipeline(&pipeline.raw);
@@ -224,7 +222,7 @@ pub extern "C" fn wgpu_render_pass_set_pipeline(
     }
 
     let pipeline_layout_guard = HUB.pipeline_layouts.read();
-    let pipeline_layout = pipeline_layout_guard.get(pipeline.layout_id);
+    let pipeline_layout = &pipeline_layout_guard[pipeline.layout_id];
     let bing_group_guard = HUB.bind_groups.read();
 
     pass.binder.pipeline_layout_id = Some(pipeline.layout_id.clone());
@@ -236,12 +234,12 @@ pub extern "C" fn wgpu_render_pass_set_pipeline(
         .enumerate()
     {
         if let Some(bg_id) = entry.expect_layout(bgl_id) {
-            let bind_group = bing_group_guard.get(bg_id);
+            let desc_set = &bing_group_guard[bg_id].raw;
             unsafe {
                 pass.raw.bind_graphics_descriptor_sets(
                     &pipeline_layout.raw,
                     index,
-                    iter::once(&bind_group.raw),
+                    iter::once(desc_set),
                     &[]
                 );
             }

src/command/transfer.rs

@@ -42,7 +42,7 @@ pub extern "C" fn wgpu_command_buffer_copy_buffer_to_buffer(
     size: u32,
 ) {
     let mut cmb_guard = HUB.command_buffers.write();
-    let cmb = cmb_guard.get_mut(command_buffer_id);
+    let cmb = &mut cmb_guard[command_buffer_id];
     let buffer_guard = HUB.buffers.read();
 
     let (src_buffer, src_usage) = cmb.trackers.buffers
@@ -101,7 +101,7 @@ pub extern "C" fn wgpu_command_buffer_copy_buffer_to_texture(
     copy_size: Extent3d,
 ) {
     let mut cmb_guard = HUB.command_buffers.write();
-    let cmb = cmb_guard.get_mut(command_buffer_id);
+    let cmb = &mut cmb_guard[command_buffer_id];
     let buffer_guard = HUB.buffers.read();
     let texture_guard = HUB.textures.read();
 
@@ -184,7 +184,7 @@ pub extern "C" fn wgpu_command_buffer_copy_texture_to_buffer(
     copy_size: Extent3d,
 ) {
     let mut cmb_guard = HUB.command_buffers.write();
-    let cmb = cmb_guard.get_mut(command_buffer_id);
+    let cmb = &mut cmb_guard[command_buffer_id];
     let buffer_guard = HUB.buffers.read();
     let texture_guard = HUB.textures.read();
 
@@ -260,7 +260,7 @@ pub extern "C" fn wgpu_command_buffer_copy_texture_to_texture(
     copy_size: Extent3d,
 ) {
     let mut cmb_guard = HUB.command_buffers.write();
-    let cmb = cmb_guard.get_mut(command_buffer_id);
+    let cmb = &mut cmb_guard[command_buffer_id];
     let texture_guard = HUB.textures.read();
 
     let (src_texture, src_usage) = cmb.trackers.textures