From b48764728d11ba042face71e3b198d63934c23b1 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Wed, 18 Nov 2020 09:24:43 -0500 Subject: [PATCH] Update gpu-alloc and naga --- Cargo.lock | 8 ++++---- wgpu-core/Cargo.toml | 4 ++-- wgpu-core/src/device/alloc.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c0709b40d..ef3637b7d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -763,8 +763,8 @@ dependencies = [ [[package]] name = "gpu-alloc" -version = "0.1.0" -source = "git+https://github.com/zakarumych/gpu-alloc?rev=2bb7ef947443b1b13e34d3b98a116da6d69ac15b#2bb7ef947443b1b13e34d3b98a116da6d69ac15b" +version = "0.2.0" +source = "git+https://github.com/zakarumych/gpu-alloc?rev=7bd745e4885286d453258cafc99ee742b64e46ea#7bd745e4885286d453258cafc99ee742b64e46ea" dependencies = [ "bitflags", "gpu-alloc-types", @@ -773,7 +773,7 @@ dependencies = [ [[package]] name = "gpu-alloc-types" version = "0.1.0" -source = "git+https://github.com/zakarumych/gpu-alloc?rev=2bb7ef947443b1b13e34d3b98a116da6d69ac15b#2bb7ef947443b1b13e34d3b98a116da6d69ac15b" +source = "git+https://github.com/zakarumych/gpu-alloc?rev=7bd745e4885286d453258cafc99ee742b64e46ea#7bd745e4885286d453258cafc99ee742b64e46ea" dependencies = [ "bitflags", ] @@ -1121,7 +1121,7 @@ dependencies = [ [[package]] name = "naga" version = "0.2.0" -source = "git+https://github.com/gfx-rs/naga?rev=4d4e1cd4cbfad2b81264a7239a336b6ec1346611#4d4e1cd4cbfad2b81264a7239a336b6ec1346611" +source = "git+https://github.com/gfx-rs/naga?rev=27ec95a2381ae8e0afd07fa13c83a436a9e0bd41#27ec95a2381ae8e0afd07fa13c83a436a9e0bd41" dependencies = [ "bitflags", "fxhash", diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml index 79883af3d..c5c0e510f 100644 --- a/wgpu-core/Cargo.toml +++ b/wgpu-core/Cargo.toml @@ -35,12 +35,12 @@ smallvec = "1" tracing = { version = "0.1", default-features = false, features = ["std"] } thiserror = "1" gfx-descriptor = "0.2" -gpu-alloc = { git = "https://github.com/zakarumych/gpu-alloc", rev = "2bb7ef947443b1b13e34d3b98a116da6d69ac15b" } +gpu-alloc = { git = "https://github.com/zakarumych/gpu-alloc", rev = "7bd745e4885286d453258cafc99ee742b64e46ea" } [dependencies.naga] version = "0.2" git = "https://github.com/gfx-rs/naga" -rev = "4d4e1cd4cbfad2b81264a7239a336b6ec1346611" +rev = "27ec95a2381ae8e0afd07fa13c83a436a9e0bd41" features = ["spv-in", "spv-out", "wgsl-in"] [dependencies.wgt] diff --git a/wgpu-core/src/device/alloc.rs b/wgpu-core/src/device/alloc.rs index acfbb7ea6..28fe81d90 100644 --- a/wgpu-core/src/device/alloc.rs +++ b/wgpu-core/src/device/alloc.rs @@ -135,7 +135,7 @@ impl MemoryBlock { } pub fn unmap(&mut self, device: &B::Device) { - unsafe { self.0.unmap(&MemoryDevice::(device)) } + unsafe { self.0.unmap(&MemoryDevice::(device)) }; } pub fn write_bytes(