Skip to content
This repository has been archived by the owner on Jun 18, 2021. It is now read-only.

Commit

Permalink
Merge #726
Browse files Browse the repository at this point in the history
726: Bump wgpu-core and update texture_view_drop call r=kvark a=mkeeter

This PR updates to the latest `wgpu-core` commit ([wgpu #1163](gfx-rs/wgpu#1163)), and is the counterpart to [wgpu-native #66](gfx-rs/wgpu-native#66).

I'm using `wait = false` in the `texture_view_drop` call to match `buffer_drop` and `texture_drop` elsewhere `backend/direct.rs`, though I don't quite understand the implications 😅

Co-authored-by: Matt Keeter <[email protected]>
  • Loading branch information
bors[bot] and mkeeter authored Jan 23, 2021
2 parents 7273dba + 2d16ade commit 8ee42da
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@ webgl = ["wgc"]
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgc]
package = "wgpu-core"
git = "https://github.com/gfx-rs/wgpu"
rev = "7c9e239a2400fab89fcf905ac42be0360224a522"
rev = "b23ece55e7abb8d449fcae09398b2402b0efee99"
features = ["raw-window-handle"]

[target.'cfg(target_arch = "wasm32")'.dependencies.wgc]
package = "wgpu-core"
git = "https://github.com/gfx-rs/wgpu"
rev = "7c9e239a2400fab89fcf905ac42be0360224a522"
rev = "b23ece55e7abb8d449fcae09398b2402b0efee99"
features = ["raw-window-handle"]
optional = true

[dependencies.wgt]
package = "wgpu-types"
git = "https://github.com/gfx-rs/wgpu"
rev = "7c9e239a2400fab89fcf905ac42be0360224a522"
rev = "b23ece55e7abb8d449fcae09398b2402b0efee99"

[dependencies]
arrayvec = "0.5"
Expand Down
2 changes: 1 addition & 1 deletion src/backend/direct.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1458,7 +1458,7 @@ impl crate::Context for Context {
}
fn texture_view_drop(&self, texture_view: &Self::TextureViewId) {
let global = &self.0;
match wgc::gfx_select!(*texture_view => global.texture_view_drop(*texture_view)) {
match wgc::gfx_select!(*texture_view => global.texture_view_drop(*texture_view, false)) {
Ok(()) => (),
Err(err) => self.handle_error_fatal(err, "TextureView::drop"),
}
Expand Down

0 comments on commit 8ee42da

Please sign in to comment.