Skip to content

Commit

Permalink
Merge #752
Browse files Browse the repository at this point in the history
752: gfx-memory update r=trivial a=kvark

**Connections**
Switches gfx-extras to gfx-rs/gfx-extras#18
Fixes #750

**Description**
Includes important correctness fixes.

**Testing**
Tested on wgpu-rs examples on macOS.
Also, by @cwfitzgerald having the repro case of #750 

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
  • Loading branch information
bors[bot] and kvark authored Jun 26, 2020
2 parents b23b9ee + 448ecc1 commit 3b6e128
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions wgpu-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ rev = "a9228d2aed38c71388489a95817238ff98198fa3"

[dependencies.gfx-descriptor]
git = "https://github.com/gfx-rs/gfx-extras"
rev = "0f7dac1b05813948fa0e5999c4fe6473f0c98f9b"
rev = "6387d81773e29be2220cb15186ceb875ed88303b"

[dependencies.gfx-memory]
git = "https://github.com/gfx-rs/gfx-extras"
rev = "0f7dac1b05813948fa0e5999c4fe6473f0c98f9b"
rev = "6387d81773e29be2220cb15186ceb875ed88303b"

[dependencies.wgt]
path = "../wgpu-types"
Expand Down
5 changes: 3 additions & 2 deletions wgpu-core/src/device/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ impl<B: GfxBackend> Device<B> {
hal_limits.non_coherent_atom_size as u64,
)
};
let descriptors = unsafe { DescriptorAllocator::new() };
#[cfg(not(feature = "trace"))]
match trace_path {
Some(_) => log::error!("Feature 'trace' is not enabled"),
Expand All @@ -241,7 +242,7 @@ impl<B: GfxBackend> Device<B> {
adapter_id,
com_allocator,
mem_allocator: Mutex::new(heaps),
desc_allocator: Mutex::new(DescriptorAllocator::new()),
desc_allocator: Mutex::new(descriptors),
queue_group,
life_guard: LifeGuard::new(),
active_submission_index: 0,
Expand Down Expand Up @@ -1448,7 +1449,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
return Err(BindGroupError::BindingsNumMismatch { expected, actual });
}

let mut desc_set = unsafe {
let mut desc_set = {
let mut desc_sets = ArrayVec::<[_; 1]>::new();
device
.desc_allocator
Expand Down

0 comments on commit 3b6e128

Please sign in to comment.