nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-02-16 17:02:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[rs] Merge #921

Browse Source 
921: Update wgpu to eadaa1b7d8 r=kvark a=kvark

Picks up https://github.com/gfx-rs/wgpu/pull/1419, https://github.com/gfx-rs/wgpu/pull/1417, and https://github.com/gfx-rs/wgpu/pull/1403

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
This commit is contained in:
bors[bot] 2021-06-01 13:10:49 +00:00 committed by GitHub
commit 6e680d96a4
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wgpu/Cargo.toml
View File

@ -26,20 +26,20 @@ cross = ["wgc/cross"]
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgc] [target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgc]
package = "wgpu-core" package = "wgpu-core"
git = "https://github.com/gfx-rs/wgpu" git = "https://github.com/gfx-rs/wgpu"
rev = "7ce535cc97958d8e224247764f3d57c162594504" rev = "eadaa1b7d8f585761e28445904fe619b180aca0d"
features = ["raw-window-handle"] features = ["raw-window-handle"]
[target.'cfg(target_arch = "wasm32")'.dependencies.wgc] [target.'cfg(target_arch = "wasm32")'.dependencies.wgc]
package = "wgpu-core" package = "wgpu-core"
git = "https://github.com/gfx-rs/wgpu" git = "https://github.com/gfx-rs/wgpu"
rev = "7ce535cc97958d8e224247764f3d57c162594504" rev = "eadaa1b7d8f585761e28445904fe619b180aca0d"
features = ["raw-window-handle"] features = ["raw-window-handle"]
optional = true optional = true
[dependencies.wgt] [dependencies.wgt]
package = "wgpu-types" package = "wgpu-types"
git = "https://github.com/gfx-rs/wgpu" git = "https://github.com/gfx-rs/wgpu"
rev = "7ce535cc97958d8e224247764f3d57c162594504" rev = "eadaa1b7d8f585761e28445904fe619b180aca0d"
[dependencies] [dependencies]
arrayvec = "0.5" arrayvec = "0.5"

12
wgpu/src/backend/direct.rs
View File

@ -1412,11 +1412,13 @@ impl crate::Context for Context {
label: desc.label.map(Borrowed), label: desc.label.map(Borrowed),
format: desc.format, format: desc.format,
dimension: desc.dimension, dimension: desc.dimension,
aspect: desc.aspect, range: wgt::ImageSubresourceRange {
base_mip_level: desc.base_mip_level, aspect: desc.aspect,
mip_level_count: desc.mip_level_count, base_mip_level: desc.base_mip_level,
base_array_layer: desc.base_array_layer, mip_level_count: desc.mip_level_count,
array_layer_count: desc.array_layer_count, base_array_layer: desc.base_array_layer,
array_layer_count: desc.array_layer_count,
},
}; };
let global = &self.0; let global = &self.0;
let (id, error) = wgc::gfx_select!( let (id, error) = wgc::gfx_select!(