mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-21 06:50:59 +01:00
Merge #1031
1031: Update gpu-alloc and naga r=straightforward a=kvark **Connections** includes critical https://github.com/zakarumych/gpu-alloc/pull/24 **Description** Updates Naga and gpu-alloc deps **Testing** Tested on wgpu-rs Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
This commit is contained in:
commit
5e1226995c
3 files changed
+7
-7
No files matched your search
Generated
+4
-4
@@ -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",
|
||||
|
||||
@@ -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]
|
||||
|
||||
@@ -135,7 +135,7 @@ impl<B: hal::Backend> MemoryBlock<B> {
|
||||
}
|
||||
|
||||
pub fn unmap(&mut self, device: &B::Device) {
|
||||
unsafe { self.0.unmap(&MemoryDevice::<B>(device)) }
|
||||
unsafe { self.0.unmap(&MemoryDevice::<B>(device)) };
|
||||
}
|
||||
|
||||
pub fn write_bytes(
|
||||
|
||||
Reference in new issue
Block a user