mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-21 23:11:01 +01:00
Improve locking safety for Registry
This commit is contained in:
1 parent
c440791ab2
commit
d4c415f666
15 files changed
+116
-155
No files matched your search
@@ -1,4 +1,4 @@
|
||||
use registry::{HUB, Items, Registry};
|
||||
use registry::{HUB, Items};
|
||||
use {
|
||||
Stored,
|
||||
BindGroupId, CommandBufferId, ComputePassId, ComputePipelineId,
|
||||
@@ -29,11 +29,11 @@ pub extern "C" fn wgpu_compute_pass_end_pass(
|
||||
pass_id: ComputePassId,
|
||||
) -> CommandBufferId {
|
||||
let pass = HUB.compute_passes
|
||||
.lock()
|
||||
.write()
|
||||
.take(pass_id);
|
||||
|
||||
HUB.command_buffers
|
||||
.lock()
|
||||
.write()
|
||||
.get_mut(pass.cmb_id.value)
|
||||
.raw
|
||||
.push(pass.raw);
|
||||
@@ -44,13 +44,13 @@ pub extern "C" fn wgpu_compute_pass_end_pass(
|
||||
pub extern "C" fn wgpu_compute_pass_set_bind_group(
|
||||
pass_id: ComputePassId, index: u32, bind_group_id: BindGroupId,
|
||||
) {
|
||||
let bind_group_guard = HUB.bind_groups.lock();
|
||||
let bind_group_guard = HUB.bind_groups.read();
|
||||
let set = &bind_group_guard.get(bind_group_id).raw;
|
||||
let layout = unimplemented!();
|
||||
// see https://github.com/gpuweb/gpuweb/pull/93
|
||||
|
||||
HUB.compute_passes
|
||||
.lock()
|
||||
.write()
|
||||
.get_mut(pass_id)
|
||||
.raw
|
||||
.bind_compute_descriptor_sets(layout, index as usize, iter::once(set), &[]);
|
||||
@@ -60,11 +60,11 @@ pub extern "C" fn wgpu_compute_pass_set_bind_group(
|
||||
pub extern "C" fn wgpu_compute_pass_set_pipeline(
|
||||
pass_id: ComputePassId, pipeline_id: ComputePipelineId,
|
||||
) {
|
||||
let pipeline_guard = HUB.compute_pipelines.lock();
|
||||
let pipeline_guard = HUB.compute_pipelines.read();
|
||||
let pipeline = &pipeline_guard.get(pipeline_id).raw;
|
||||
|
||||
HUB.compute_passes
|
||||
.lock()
|
||||
.write()
|
||||
.get_mut(pass_id)
|
||||
.raw
|
||||
.bind_compute_pipeline(pipeline);
|
||||
@@ -75,7 +75,7 @@ pub extern "C" fn wgpu_compute_pass_dispatch(
|
||||
pass_id: ComputePassId, x: u32, y: u32, z: u32,
|
||||
) {
|
||||
HUB.compute_passes
|
||||
.lock()
|
||||
.write()
|
||||
.get_mut(pass_id)
|
||||
.raw
|
||||
.dispatch([x, y, z]);
|
||||
|
||||
@@ -15,7 +15,7 @@ use {
|
||||
};
|
||||
use conv;
|
||||
use device::{FramebufferKey, RenderPassKey};
|
||||
use registry::{HUB, Items, Registry};
|
||||
use registry::{HUB, Items};
|
||||
use track::{BufferTracker, TextureTracker};
|
||||
|
||||
use std::collections::hash_map::Entry;
|
||||
@@ -97,8 +97,8 @@ impl CommandBuffer<B> {
|
||||
I: Iterator<Item = (BufferId, Range<BufferUsageFlags>)>,
|
||||
J: Iterator<Item = (TextureId, Range<TextureUsageFlags>)>,
|
||||
{
|
||||
let buffer_guard = HUB.buffers.lock();
|
||||
let texture_guard = HUB.textures.lock();
|
||||
let buffer_guard = HUB.buffers.read();
|
||||
let texture_guard = HUB.textures.read();
|
||||
|
||||
let buffer_barriers = buffer_iter.map(|(id, transit)| {
|
||||
let b = buffer_guard.get(id);
|
||||
@@ -137,11 +137,11 @@ pub extern "C" fn wgpu_command_buffer_begin_render_pass(
|
||||
command_buffer_id: CommandBufferId,
|
||||
desc: RenderPassDescriptor<TextureViewId>,
|
||||
) -> RenderPassId {
|
||||
let mut cmb_guard = HUB.command_buffers.lock();
|
||||
let mut cmb_guard = HUB.command_buffers.write();
|
||||
let cmb = cmb_guard.get_mut(command_buffer_id);
|
||||
let device_guard = HUB.devices.lock();
|
||||
let device_guard = HUB.devices.read();
|
||||
let device = device_guard.get(cmb.device_id.value);
|
||||
let view_guard = HUB.texture_views.lock();
|
||||
let view_guard = HUB.texture_views.read();
|
||||
|
||||
let mut current_comb = device.com_allocator.extend(cmb);
|
||||
current_comb.begin(
|
||||
@@ -202,7 +202,7 @@ pub extern "C" fn wgpu_command_buffer_begin_render_pass(
|
||||
}
|
||||
};
|
||||
|
||||
let mut render_pass_cache = device.render_passes.lock().unwrap();
|
||||
let mut render_pass_cache = device.render_passes.lock();
|
||||
let render_pass = match render_pass_cache.entry(rp_key) {
|
||||
Entry::Occupied(e) => e.into_mut(),
|
||||
Entry::Vacant(e) => {
|
||||
@@ -231,7 +231,7 @@ pub extern "C" fn wgpu_command_buffer_begin_render_pass(
|
||||
}
|
||||
};
|
||||
|
||||
let mut framebuffer_cache = device.framebuffers.lock().unwrap();
|
||||
let mut framebuffer_cache = device.framebuffers.lock();
|
||||
let fb_key = FramebufferKey {
|
||||
attachments: desc.color_attachments
|
||||
.iter()
|
||||
@@ -287,7 +287,7 @@ pub extern "C" fn wgpu_command_buffer_begin_render_pass(
|
||||
);
|
||||
|
||||
HUB.render_passes
|
||||
.lock()
|
||||
.write()
|
||||
.register(RenderPass::new(
|
||||
current_comb,
|
||||
Stored {
|
||||
@@ -301,7 +301,7 @@ pub extern "C" fn wgpu_command_buffer_begin_render_pass(
|
||||
pub extern "C" fn wgpu_command_buffer_begin_compute_pass(
|
||||
command_buffer_id: CommandBufferId,
|
||||
) -> ComputePassId {
|
||||
let mut cmb_guard = HUB.command_buffers.lock();
|
||||
let mut cmb_guard = HUB.command_buffers.write();
|
||||
let cmb = cmb_guard.get_mut(command_buffer_id);
|
||||
|
||||
let raw = cmb.raw.pop().unwrap();
|
||||
@@ -311,6 +311,6 @@ pub extern "C" fn wgpu_command_buffer_begin_compute_pass(
|
||||
};
|
||||
|
||||
HUB.compute_passes
|
||||
.lock()
|
||||
.write()
|
||||
.register(ComputePass::new(raw, stored))
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
use registry::{HUB, Items, Registry};
|
||||
use registry::{HUB, Items};
|
||||
use track::{BufferTracker, TextureTracker};
|
||||
use {
|
||||
CommandBuffer, Stored,
|
||||
@@ -35,11 +35,11 @@ pub extern "C" fn wgpu_render_pass_end_pass(
|
||||
pass_id: RenderPassId,
|
||||
) -> CommandBufferId {
|
||||
let mut pass = HUB.render_passes
|
||||
.lock()
|
||||
.write()
|
||||
.take(pass_id);
|
||||
pass.raw.end_render_pass();
|
||||
|
||||
let mut cmb_guard = HUB.command_buffers.lock();
|
||||
let mut cmb_guard = HUB.command_buffers.write();
|
||||
let cmb = cmb_guard.get_mut(pass.cmb_id.value);
|
||||
|
||||
if let Some(ref mut last) = cmb.raw.last_mut() {
|
||||
|
||||
Reference in new issue
Block a user