Skip to content

Commit

Permalink
Merge #297
Browse files Browse the repository at this point in the history
297: Update rendy-memory and rendy-descriptor to 0.4 from crates.io r=kvark a=yanchith

I also locally tested for regressions in `wgpu-rs` on the metal backend (only have macOS today) and the examples seemed ok.

Co-authored-by: yanchith <[email protected]>
  • Loading branch information
bors[bot] and yanchith authored Aug 20, 2019
2 parents cb56ce3 + f741842 commit 3d0c6a5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 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-native/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ gfx-backend-dx11 = { version = "0.3.0", optional = true }
gfx-backend-metal = { version = "0.3.0", optional = true }
gfx-backend-gl = { version = "0.3.0", optional = true }
parking_lot = { version = "0.9" }
rendy-memory = { git = "https://github.com/amethyst/rendy", rev = "db6adbe7454f52ebf559a38dd88580aa3ebbcaaf" }
rendy-descriptor = { git = "https://github.com/amethyst/rendy", rev = "db6adbe7454f52ebf559a38dd88580aa3ebbcaaf" }
rendy-memory = { version = "0.4" }
rendy-descriptor = { version = "0.4" }
serde = { version = "1.0", features = ["serde_derive"], optional = true }
vec_map = "0.8"
winit = { version = "0.19", optional = true }

0 comments on commit 3d0c6a5

Please sign in to comment.