Epoch tracking of indices

Author: kvark

Cargo.lock

@@ -1,6 +1,7 @@
 use log::info;
 
 
+#[allow(dead_code)]
 pub fn cast_slice<T>(data: &[T]) -> &[u8] {
     use std::mem::size_of;
     use std::slice::from_raw_parts;

gfx-examples/src/framework.rs

@@ -1 +1,2 @@
 newline_style = "Native"
+spaces_around_ranges = true

rustfmt.toml

@@ -153,7 +153,9 @@ typedef enum {
   WGPUVertexFormat_IntR8G8B8A8 = 4,
 } WGPUVertexFormat;
 
-typedef uint32_t WGPUId;
+typedef struct WGPUBufferMapAsyncStatus WGPUBufferMapAsyncStatus;
+
+typedef struct WGPUId WGPUId;
 
 typedef WGPUId WGPUDeviceId;
 
@@ -169,6 +171,10 @@ typedef struct {
 
 typedef WGPUId WGPUBufferId;
 
+typedef void (*WGPUBufferMapReadCallback)(WGPUBufferMapAsyncStatus status, const uint8_t *data, uint8_t *userdata);
+
+typedef void (*WGPUBufferMapWriteCallback)(WGPUBufferMapAsyncStatus status, uint8_t *data, uint8_t *userdata);
+
 typedef WGPUId WGPUCommandBufferId;
 
 typedef struct {
@@ -553,11 +559,25 @@ WGPUDeviceId wgpu_adapter_create_device(WGPUAdapterId adapter_id, const WGPUDevi
 
 void wgpu_buffer_destroy(WGPUBufferId buffer_id);
 
+void wgpu_buffer_map_read_async(WGPUBufferId buffer_id,
+                                uint32_t start,
+                                uint32_t size,
+                                WGPUBufferMapReadCallback callback,
+                                uint8_t *userdata);
+
+void wgpu_buffer_map_write_async(WGPUBufferId buffer_id,
+                                 uint32_t start,
+                                 uint32_t size,
+                                 WGPUBufferMapWriteCallback callback,
+                                 uint8_t *userdata);
+
 void wgpu_buffer_set_sub_data(WGPUBufferId buffer_id,
                               uint32_t start,
                               uint32_t count,
                               const uint8_t *data);
 
+void wgpu_buffer_unmap(WGPUBufferId buffer_id);
+
 void wgpu_command_buffer_copy_buffer_to_buffer(WGPUCommandBufferId command_buffer_id,
                                                WGPUBufferId src,
                                                uint32_t src_offset,

wgpu-bindings/wgpu.h

@@ -22,6 +22,7 @@ remote = ["serde"]
 metal-auto-capture = ["gfx-backend-metal/auto-capture"]
 
 [dependencies]
+arrayvec = "0.4"
 bitflags = "1.0"
 lazy_static = "1.1.0"
 log = "0.4"
@@ -34,4 +35,5 @@ gfx-backend-dx12 = { version = "0.1.0", optional = true }
 gfx-backend-metal = { version = "0.1.0", optional = true }
 #rendy-memory = { git = "https://github.com/rustgd/rendy", rev = "ce7dd7f", features = ["gfx-hal"] }
 serde = { version = "1.0", features = ["serde_derive"], optional = true }
+vec_map = "0.8"
 winit = { version = "0.18", optional = true }

wgpu-native/Cargo.toml

@@ -1,6 +1,6 @@
 use crate::track::TrackerSet;
 use crate::{
-    LifeGuard, WeaklyStored,
+    LifeGuard,
     BindGroupLayoutId, BufferId, SamplerId, TextureViewId,
 };
 
@@ -50,7 +50,7 @@ pub struct PipelineLayoutDescriptor {
 
 pub struct PipelineLayout<B: hal::Backend> {
     pub(crate) raw: B::PipelineLayout,
-    pub(crate) bind_group_layout_ids: Vec<WeaklyStored<BindGroupLayoutId>>,
+    pub(crate) bind_group_layout_ids: Vec<BindGroupLayoutId>,
 }
 
 #[repr(C)]
@@ -82,7 +82,7 @@ pub struct BindGroupDescriptor {
 
 pub struct BindGroup<B: hal::Backend> {
     pub(crate) raw: B::DescriptorSet,
-    pub(crate) layout_id: WeaklyStored<BindGroupLayoutId>,
+    pub(crate) layout_id: BindGroupLayoutId,
     pub(crate) life_guard: LifeGuard,
     pub(crate) used: TrackerSet,
 }

wgpu-native/src/binding_model.rs

@@ -1,17 +1,17 @@
 use crate::{
-    BindGroupHandle, Stored, WeaklyStored,
+    BindGroupHandle, Stored,
     BindGroupId, BindGroupLayoutId, PipelineLayoutId,
 };
 
 
 pub struct BindGroupPair {
-    layout_id: WeaklyStored<BindGroupLayoutId>,
+    layout_id: BindGroupLayoutId,
     group_id: Stored<BindGroupId>,
 }
 
 #[derive(Default)]
 pub struct BindGroupEntry {
-    expected_layout_id: Option<WeaklyStored<BindGroupLayoutId>>,
+    expected_layout_id: Option<BindGroupLayoutId>,
     provided: Option<BindGroupPair>,
 }
 
@@ -38,12 +38,12 @@ impl BindGroupEntry {
     pub fn expect_layout(
         &mut self, bind_group_layout_id: BindGroupLayoutId,
     ) -> Option<BindGroupId> {
-        let some = Some(WeaklyStored(bind_group_layout_id));
+        let some = Some(bind_group_layout_id);
         if self.expected_layout_id != some {
             self.expected_layout_id = some;
             match self.provided {
-                Some(BindGroupPair { ref layout_id, ref group_id })
-                    if layout_id.0 == bind_group_layout_id => Some(group_id.value),
+                Some(BindGroupPair { layout_id, ref group_id })
+                    if layout_id == bind_group_layout_id => Some(group_id.value),
                 Some(_) | None => None,
             }
         } else {
@@ -54,7 +54,7 @@ impl BindGroupEntry {
 
 #[derive(Default)]
 pub struct Binder {
-    pub(crate) pipeline_layout_id: Option<WeaklyStored<PipelineLayoutId>>, //TODO: strongly `Stored`
+    pub(crate) pipeline_layout_id: Option<PipelineLayoutId>, //TODO: strongly `Stored`
     pub(crate) entries: Vec<BindGroupEntry>,
 }
 
@@ -70,7 +70,7 @@ impl Binder {
     ) -> Option<PipelineLayoutId> {
         self.ensure_length(index + 1);
         if self.entries[index].provide(bind_group_id, bind_group) {
-            self.pipeline_layout_id.as_ref().map(|&WeaklyStored(id)| id)
+            self.pipeline_layout_id.as_ref().cloned()
         } else {
             None
         }

wgpu-native/src/command/bind.rs

@@ -112,18 +112,18 @@ 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.0);
+    let pipeline_layout = pipeline_layout_guard.get(pipeline.layout_id);
     let bing_group_guard = HUB.bind_groups.read();
 
     pass.binder.pipeline_layout_id = Some(pipeline.layout_id.clone());
     pass.binder.ensure_length(pipeline_layout.bind_group_layout_ids.len());
 
-    for (index, (entry, bgl_id)) in pass.binder.entries
+    for (index, (entry, &bgl_id)) in pass.binder.entries
         .iter_mut()
         .zip(&pipeline_layout.bind_group_layout_ids)
         .enumerate()
     {
-        if let Some(bg_id) = entry.expect_layout(bgl_id.0) {
+        if let Some(bg_id) = entry.expect_layout(bgl_id) {
             let bind_group = bing_group_guard.get(bg_id);
             unsafe {
                 pass.raw.bind_compute_descriptor_sets(

wgpu-native/src/command/compute.rs

@@ -22,7 +22,7 @@ use crate::{
     BufferId, CommandBufferId, CommandEncoderId, DeviceId,
     TextureId, TextureViewId,
     BufferUsageFlags, TextureUsageFlags, Color,
-    LifeGuard, Stored, WeaklyStored,
+    LifeGuard, Stored,
     CommandBufferHandle,
 };
 #[cfg(feature = "local")]
@@ -294,9 +294,9 @@ pub fn command_encoder_begin_render_pass(
     let fb_key = FramebufferKey {
         attachments: color_attachments
             .iter()
-            .map(|at| WeaklyStored(at.attachment))
+            .map(|at| at.attachment)
             .chain(
-                depth_stencil_attachment.map(|at| WeaklyStored(at.attachment)),
+                depth_stencil_attachment.map(|at| at.attachment),
             )
             .collect(),
     };
@@ -308,7 +308,7 @@ pub fn command_encoder_begin_render_pass(
                     .key()
                     .attachments
                     .iter()
-                    .map(|&WeaklyStored(id)| &view_guard.get(id).raw);
+                    .map(|&id| &view_guard.get(id).raw);
 
                 unsafe {
                     device
@@ -374,7 +374,7 @@ pub extern "C" fn wgpu_command_encoder_begin_render_pass(
     desc: RenderPassDescriptor,
 ) -> RenderPassId {
     let pass = command_encoder_begin_render_pass(command_encoder_id, desc);
-    HUB.render_passes.register(pass)
+    HUB.render_passes.register_local(pass)
 }
 
 pub fn command_encoder_begin_compute_pass(
@@ -398,5 +398,5 @@ pub extern "C" fn wgpu_command_encoder_begin_compute_pass(
     command_encoder_id: CommandEncoderId,
 ) -> ComputePassId {
     let pass = command_encoder_begin_compute_pass(command_encoder_id);
-    HUB.compute_passes.register(pass)
+    HUB.compute_passes.register_local(pass)
 }

wgpu-native/src/command/mod.rs

@@ -224,18 +224,18 @@ 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.0);
+    let pipeline_layout = pipeline_layout_guard.get(pipeline.layout_id);
     let bing_group_guard = HUB.bind_groups.read();
 
     pass.binder.pipeline_layout_id = Some(pipeline.layout_id.clone());
     pass.binder.ensure_length(pipeline_layout.bind_group_layout_ids.len());
 
-    for (index, (entry, bgl_id)) in pass.binder.entries
+    for (index, (entry, &bgl_id)) in pass.binder.entries
         .iter_mut()
         .zip(&pipeline_layout.bind_group_layout_ids)
         .enumerate()
     {
-        if let Some(bg_id) = entry.expect_layout(bgl_id.0) {
+        if let Some(bg_id) = entry.expect_layout(bgl_id) {
             let bind_group = bing_group_guard.get(bg_id);
             unsafe {
                 pass.raw.bind_graphics_descriptor_sets(