From 418dbd66478525c642c0644838a8cb879477741a Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Fri, 19 Jul 2019 15:47:27 -0400 Subject: [PATCH] gfx-hal updated, non-normalized coordinates --- Cargo.lock | 43 +++++++++++++++++++++------------ libportability-gfx/src/impls.rs | 1 + 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 46d45c4..460a28c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -161,7 +161,7 @@ dependencies = [ [[package]] name = "copyless" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -315,7 +315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "gfx-backend-dx11" version = "0.2.0" -source = "git+https://github.com/gfx-rs/gfx#c4ebe0b927539627d0777f182d4bc4e32161a770" +source = "git+https://github.com/gfx-rs/gfx#83667d7fd027e122f812921094892017865ff67d" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "derivative 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -333,7 +333,7 @@ dependencies = [ [[package]] name = "gfx-backend-dx12" version = "0.2.1" -source = "git+https://github.com/gfx-rs/gfx#c4ebe0b927539627d0777f182d4bc4e32161a770" +source = "git+https://github.com/gfx-rs/gfx#83667d7fd027e122f812921094892017865ff67d" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "d3d12 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -349,8 +349,8 @@ dependencies = [ [[package]] name = "gfx-backend-empty" -version = "0.2.0" -source = "git+https://github.com/gfx-rs/gfx#c4ebe0b927539627d0777f182d4bc4e32161a770" +version = "0.2.1" +source = "git+https://github.com/gfx-rs/gfx#83667d7fd027e122f812921094892017865ff67d" dependencies = [ "gfx-hal 0.2.1 (git+https://github.com/gfx-rs/gfx)", ] @@ -358,7 +358,7 @@ dependencies = [ [[package]] name = "gfx-backend-gl" version = "0.2.0" -source = "git+https://github.com/gfx-rs/gfx#c4ebe0b927539627d0777f182d4bc4e32161a770" +source = "git+https://github.com/gfx-rs/gfx#83667d7fd027e122f812921094892017865ff67d" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "gfx-hal 0.2.1 (git+https://github.com/gfx-rs/gfx)", @@ -378,13 +378,13 @@ dependencies = [ [[package]] name = "gfx-backend-metal" version = "0.2.2" -source = "git+https://github.com/gfx-rs/gfx#c4ebe0b927539627d0777f182d4bc4e32161a770" +source = "git+https://github.com/gfx-rs/gfx#83667d7fd027e122f812921094892017865ff67d" dependencies = [ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "cocoa 0.18.4 (registry+https://github.com/rust-lang/crates.io-index)", - "copyless 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx-hal 0.2.1 (git+https://github.com/gfx-rs/gfx)", @@ -394,7 +394,7 @@ dependencies = [ "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "range-alloc 0.1.0 (git+https://github.com/gfx-rs/gfx)", "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", - "spirv_cross 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", + "spirv_cross 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "storage-map 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "winit 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -402,7 +402,7 @@ dependencies = [ [[package]] name = "gfx-backend-vulkan" version = "0.2.3" -source = "git+https://github.com/gfx-rs/gfx#c4ebe0b927539627d0777f182d4bc4e32161a770" +source = "git+https://github.com/gfx-rs/gfx#83667d7fd027e122f812921094892017865ff67d" dependencies = [ "ash 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -422,7 +422,7 @@ dependencies = [ [[package]] name = "gfx-hal" version = "0.2.1" -source = "git+https://github.com/gfx-rs/gfx#c4ebe0b927539627d0777f182d4bc4e32161a770" +source = "git+https://github.com/gfx-rs/gfx#83667d7fd027e122f812921094892017865ff67d" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -848,11 +848,11 @@ dependencies = [ name = "portability-gfx" version = "0.1.0" dependencies = [ - "copyless 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", "gfx-backend-dx11 0.2.0 (git+https://github.com/gfx-rs/gfx)", "gfx-backend-dx12 0.2.1 (git+https://github.com/gfx-rs/gfx)", - "gfx-backend-empty 0.2.0 (git+https://github.com/gfx-rs/gfx)", + "gfx-backend-empty 0.2.1 (git+https://github.com/gfx-rs/gfx)", "gfx-backend-gl 0.2.0 (git+https://github.com/gfx-rs/gfx)", "gfx-backend-metal 0.2.2 (git+https://github.com/gfx-rs/gfx)", "gfx-backend-vulkan 0.2.3 (git+https://github.com/gfx-rs/gfx)", @@ -1001,7 +1001,7 @@ dependencies = [ [[package]] name = "range-alloc" version = "0.1.0" -source = "git+https://github.com/gfx-rs/gfx#c4ebe0b927539627d0777f182d4bc4e32161a770" +source = "git+https://github.com/gfx-rs/gfx#83667d7fd027e122f812921094892017865ff67d" [[package]] name = "rdrand" @@ -1165,6 +1165,16 @@ dependencies = [ "wasm-bindgen 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "spirv_cross" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", + "js-sys 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "stable_deref_trait" version = "1.1.1" @@ -1647,7 +1657,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum cocoa 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0c23085dde1ef4429df6e5896b89356d35cdd321fb43afe3e378d010bb5adc6" "checksum cocoa 0.18.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cf79daa4e11e5def06e55306aa3601b87de6b5149671529318da048f67cdd77b" -"checksum copyless 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f8ffa29b14f03d473f1558c789d020fe41bb7790774f429ff818f4ed9a6f9a0e" +"checksum copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6ff9c56c9fb2a49c05ef0e431485a22400af20d33226dc0764d891d09e724127" "checksum core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "286e0b41c3a20da26536c6000a280585d519fd07b3956b43aed8a79e9edce980" "checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" "checksum core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa" @@ -1668,7 +1678,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" "checksum gfx-backend-dx11 0.2.0 (git+https://github.com/gfx-rs/gfx)" = "" "checksum gfx-backend-dx12 0.2.1 (git+https://github.com/gfx-rs/gfx)" = "" -"checksum gfx-backend-empty 0.2.0 (git+https://github.com/gfx-rs/gfx)" = "" +"checksum gfx-backend-empty 0.2.1 (git+https://github.com/gfx-rs/gfx)" = "" "checksum gfx-backend-gl 0.2.0 (git+https://github.com/gfx-rs/gfx)" = "" "checksum gfx-backend-metal 0.2.2 (git+https://github.com/gfx-rs/gfx)" = "" "checksum gfx-backend-vulkan 0.2.3 (git+https://github.com/gfx-rs/gfx)" = "" @@ -1754,6 +1764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum smithay-client-toolkit 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aa4899558362a65589b53313935099835acf999740915e134dff20cca7c6a28b" "checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" "checksum spirv_cross 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b03b5986fa339f976b69dc363b4facb9df5683f40ec48c9716c38b42a4cb10cc" +"checksum spirv_cross 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cd72403fee8f7ec2f4f453dfbaf39ccdd4c6d0157d67d6e65513cd26cc49289f" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum stb_truetype 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "69b7df505db8e81d54ff8be4693421e5b543e08214bd8d99eb761fcb4d5668ba" "checksum storage-map 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cb94f167ccba0941876c8e722e888be8b4c05511ffdacc8cfcd4c647adfd424d" diff --git a/libportability-gfx/src/impls.rs b/libportability-gfx/src/impls.rs index d25c5e9..a279ad4 100644 --- a/libportability-gfx/src/impls.rs +++ b/libportability-gfx/src/impls.rs @@ -2605,6 +2605,7 @@ pub extern "C" fn gfxCreateSampler( None }, border: [0.0; 4].into(), // TODO + normalized: info.unnormalizedCoordinates == VK_FALSE, anisotropic: if info.anisotropyEnable == VK_TRUE { hal::image::Anisotropic::On(info.maxAnisotropy as _) } else {