From 6f98733218509b8832323a19d5bf3808918d96cb Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Thu, 16 Aug 2018 15:39:37 -0400 Subject: [PATCH] gfx-rs update for vertex buffer logic, make packaging --- .gitignore | 2 ++ Cargo.lock | 16 ++++++++-------- Makefile | 3 +++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index a72292a..de01e36 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ target/ conformance/*.xml conformance/*.qpa conformance/*.txt +package.zip **/*.rs.bk .vscode/ .lldbinit +.DS_Store diff --git a/Cargo.lock b/Cargo.lock index a7e55c9..a8eafdb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -297,7 +297,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "gfx-backend-dx11" version = "0.1.0" -source = "git+https://github.com/gfx-rs/gfx#92d57743ffa2c2e2ee99b2f1a5c2b1ecddd7e308" +source = "git+https://github.com/gfx-rs/gfx#b2b3f8a8d629556504ed3200f7d894a908fc7380" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "derivative 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -314,7 +314,7 @@ dependencies = [ [[package]] name = "gfx-backend-dx12" version = "0.1.0" -source = "git+https://github.com/gfx-rs/gfx#92d57743ffa2c2e2ee99b2f1a5c2b1ecddd7e308" +source = "git+https://github.com/gfx-rs/gfx#b2b3f8a8d629556504ed3200f7d894a908fc7380" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "derivative 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -330,7 +330,7 @@ dependencies = [ [[package]] name = "gfx-backend-metal" version = "0.1.0" -source = "git+https://github.com/gfx-rs/gfx#92d57743ffa2c2e2ee99b2f1a5c2b1ecddd7e308" +source = "git+https://github.com/gfx-rs/gfx#b2b3f8a8d629556504ed3200f7d894a908fc7380" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -351,7 +351,7 @@ dependencies = [ [[package]] name = "gfx-backend-vulkan" version = "0.1.0" -source = "git+https://github.com/gfx-rs/gfx#92d57743ffa2c2e2ee99b2f1a5c2b1ecddd7e308" +source = "git+https://github.com/gfx-rs/gfx#b2b3f8a8d629556504ed3200f7d894a908fc7380" dependencies = [ "ash 0.24.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -368,7 +368,7 @@ dependencies = [ [[package]] name = "gfx-hal" version = "0.1.0" -source = "git+https://github.com/gfx-rs/gfx#92d57743ffa2c2e2ee99b2f1a5c2b1ecddd7e308" +source = "git+https://github.com/gfx-rs/gfx#b2b3f8a8d629556504ed3200f7d894a908fc7380" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -600,7 +600,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -672,7 +672,7 @@ dependencies = [ [[package]] name = "rand" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1234,7 +1234,7 @@ dependencies = [ "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" "checksum quote 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ed7d650913520df631972f21e104a4fa2f9c82a14afc65d17b388a2e29731e7c" -"checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5" +"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd" "checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c" "checksum rand_core 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "edecf0f94da5551fc9b492093e30b041a891657db7940ee221f9d2f66e82eef2" "checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1" diff --git a/Makefile b/Makefile index b580f0b..12c0049 100644 --- a/Makefile +++ b/Makefile @@ -154,6 +154,9 @@ clean: rm -f $(NATIVE_OBJECTS) $(NATIVE_TARGET) $(BINDING) cargo clean +package.zip: version-debug version-release + zip package.zip target/*/libportability.$(LIB_EXTENSION) .git/refs/heads/master + target/debug/libvulkan.$(LIB_EXTENSION): cd target/debug && ln -sf libportability.$(LIB_EXTENSION) libvulkan.$(LIB_EXTENSION)