mirror of
https://github.com/gfx-rs/wgpu.git
synced 2024-11-25 00:03:29 +00:00
Manifests update for 0.11
This commit is contained in:
parent
85fbbbbbf3
commit
016b319b38
15
Cargo.lock
generated
15
Cargo.lock
generated
@ -983,8 +983,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "naga"
|
name = "naga"
|
||||||
version = "0.6.0"
|
version = "0.7.0"
|
||||||
source = "git+https://github.com/gfx-rs/naga?rev=2e7d629#2e7d629aefe6857ade4f96fe2c3dc1a09f0fa4db"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "032288733590c094012e5f1dec15848be90015bb9b3fd16743d84ea582c4154a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bit-set",
|
"bit-set",
|
||||||
"bitflags",
|
"bitflags",
|
||||||
@ -1781,7 +1782,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wgpu"
|
name = "wgpu"
|
||||||
version = "0.10.1"
|
version = "0.11.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayvec",
|
"arrayvec",
|
||||||
"async-executor",
|
"async-executor",
|
||||||
@ -1815,7 +1816,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wgpu-core"
|
name = "wgpu-core"
|
||||||
version = "0.10.0"
|
version = "0.11.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayvec",
|
"arrayvec",
|
||||||
"bitflags",
|
"bitflags",
|
||||||
@ -1837,7 +1838,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wgpu-hal"
|
name = "wgpu-hal"
|
||||||
version = "0.10.1"
|
version = "0.11.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayvec",
|
"arrayvec",
|
||||||
"ash",
|
"ash",
|
||||||
@ -1875,7 +1876,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wgpu-info"
|
name = "wgpu-info"
|
||||||
version = "0.10.0"
|
version = "0.11.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"env_logger",
|
"env_logger",
|
||||||
"wgpu",
|
"wgpu",
|
||||||
@ -1883,7 +1884,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wgpu-types"
|
name = "wgpu-types"
|
||||||
version = "0.10.0"
|
version = "0.11.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"bitflags_serde_shim",
|
"bitflags_serde_shim",
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "wgpu-core"
|
name = "wgpu-core"
|
||||||
version = "0.10.0"
|
version = "0.11.0"
|
||||||
authors = ["wgpu developers"]
|
authors = ["wgpu developers"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
description = "WebGPU core logic on wgpu-hal"
|
description = "WebGPU core logic on wgpu-hal"
|
||||||
@ -35,33 +35,33 @@ smallvec = "1"
|
|||||||
thiserror = "1"
|
thiserror = "1"
|
||||||
|
|
||||||
[dependencies.naga]
|
[dependencies.naga]
|
||||||
git = "https://github.com/gfx-rs/naga"
|
#git = "https://github.com/gfx-rs/naga"
|
||||||
rev = "2e7d629"
|
#rev = "2e7d629"
|
||||||
#version = "0.6"
|
version = "0.7"
|
||||||
features = ["validate", "wgsl-in"]
|
features = ["validate", "wgsl-in"]
|
||||||
|
|
||||||
[dependencies.wgt]
|
[dependencies.wgt]
|
||||||
path = "../wgpu-types"
|
path = "../wgpu-types"
|
||||||
package = "wgpu-types"
|
package = "wgpu-types"
|
||||||
version = "0.10"
|
version = "0.11"
|
||||||
|
|
||||||
[dependencies.hal]
|
[dependencies.hal]
|
||||||
path = "../wgpu-hal"
|
path = "../wgpu-hal"
|
||||||
package = "wgpu-hal"
|
package = "wgpu-hal"
|
||||||
version = "0.10.1"
|
version = "0.11"
|
||||||
|
|
||||||
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
||||||
hal = { path = "../wgpu-hal", package = "wgpu-hal", version = "0.10", features = ["gles"] }
|
hal = { path = "../wgpu-hal", package = "wgpu-hal", version = "0.11", features = ["gles"] }
|
||||||
|
|
||||||
[target.'cfg(all(not(target_arch = "wasm32"), any(target_os = "ios", target_os = "macos")))'.dependencies]
|
[target.'cfg(all(not(target_arch = "wasm32"), any(target_os = "ios", target_os = "macos")))'.dependencies]
|
||||||
hal = { path = "../wgpu-hal", package = "wgpu-hal", version = "0.10", features = ["metal"] }
|
hal = { path = "../wgpu-hal", package = "wgpu-hal", version = "0.11", features = ["metal"] }
|
||||||
#Note: could also enable "vulkan" for Vulkan Portability
|
#Note: could also enable "vulkan" for Vulkan Portability
|
||||||
|
|
||||||
[target.'cfg(all(not(target_arch = "wasm32"), unix, not(target_os = "ios"), not(target_os = "macos")))'.dependencies]
|
[target.'cfg(all(not(target_arch = "wasm32"), unix, not(target_os = "ios"), not(target_os = "macos")))'.dependencies]
|
||||||
hal = { path = "../wgpu-hal", package = "wgpu-hal", version = "0.10", features = ["vulkan", "gles", "renderdoc"] }
|
hal = { path = "../wgpu-hal", package = "wgpu-hal", version = "0.11", features = ["vulkan", "gles", "renderdoc"] }
|
||||||
|
|
||||||
[target.'cfg(all(not(target_arch = "wasm32"), windows))'.dependencies]
|
[target.'cfg(all(not(target_arch = "wasm32"), windows))'.dependencies]
|
||||||
hal = { path = "../wgpu-hal", package = "wgpu-hal", version = "0.10", features = ["vulkan", "dx12", "renderdoc"] }
|
hal = { path = "../wgpu-hal", package = "wgpu-hal", version = "0.11", features = ["vulkan", "dx12", "renderdoc"] }
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
cfg_aliases = "0.1"
|
cfg_aliases = "0.1"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "wgpu-hal"
|
name = "wgpu-hal"
|
||||||
version = "0.10.1"
|
version = "0.11.0"
|
||||||
authors = ["wgpu developers"]
|
authors = ["wgpu developers"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
description = "WebGPU hardware abstraction layer"
|
description = "WebGPU hardware abstraction layer"
|
||||||
@ -52,7 +52,7 @@ range-alloc = { version = "0.1", optional = true }
|
|||||||
[dependencies.wgt]
|
[dependencies.wgt]
|
||||||
package = "wgpu-types"
|
package = "wgpu-types"
|
||||||
path = "../wgpu-types"
|
path = "../wgpu-types"
|
||||||
version = "0.10"
|
version = "0.11"
|
||||||
|
|
||||||
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
|
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
|
||||||
egl = { package = "khronos-egl", version = "4.1", features = ["dynamic"], optional = true }
|
egl = { package = "khronos-egl", version = "4.1", features = ["dynamic"], optional = true }
|
||||||
@ -74,14 +74,14 @@ web-sys = { version = "0.3", features = ["Window", "HtmlCanvasElement", "WebGl2R
|
|||||||
js-sys = { version = "0.3" }
|
js-sys = { version = "0.3" }
|
||||||
|
|
||||||
[dependencies.naga]
|
[dependencies.naga]
|
||||||
git = "https://github.com/gfx-rs/naga"
|
#git = "https://github.com/gfx-rs/naga"
|
||||||
rev = "2e7d629"
|
#rev = "2e7d629"
|
||||||
#version = "0.6"
|
version = "0.7"
|
||||||
|
|
||||||
[dev-dependencies.naga]
|
[dev-dependencies.naga]
|
||||||
git = "https://github.com/gfx-rs/naga"
|
#git = "https://github.com/gfx-rs/naga"
|
||||||
rev = "2e7d629"
|
#rev = "2e7d629"
|
||||||
#version = "0.6"
|
version = "0.7"
|
||||||
features = ["wgsl-in"]
|
features = ["wgsl-in"]
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "wgpu-info"
|
name = "wgpu-info"
|
||||||
version = "0.10.0"
|
version = "0.11.0"
|
||||||
authors = ["wgpu developers"]
|
authors = ["wgpu developers"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
description = "Adapter information and per-adapter test program"
|
description = "Adapter information and per-adapter test program"
|
||||||
@ -11,4 +11,4 @@ license = "MIT OR Apache-2.0"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
env_logger = "0.8"
|
env_logger = "0.8"
|
||||||
wgpu = { version = "0.10", path = "../wgpu" }
|
wgpu = { version = "0.11", path = "../wgpu" }
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "wgpu-types"
|
name = "wgpu-types"
|
||||||
version = "0.10.0"
|
version = "0.11.0"
|
||||||
authors = ["wgpu developers"]
|
authors = ["wgpu developers"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
description = "WebGPU types"
|
description = "WebGPU types"
|
||||||
|
146
wgpu/Cargo.toml
146
wgpu/Cargo.toml
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "wgpu"
|
name = "wgpu"
|
||||||
version = "0.10.1"
|
version = "0.11.0"
|
||||||
authors = ["wgpu developers"]
|
authors = ["wgpu developers"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
description = "Rusty WebGPU API wrapper"
|
description = "Rusty WebGPU API wrapper"
|
||||||
@ -30,77 +30,6 @@ all-features = true
|
|||||||
name = "wgpu-tests"
|
name = "wgpu-tests"
|
||||||
path = "tests/root.rs"
|
path = "tests/root.rs"
|
||||||
|
|
||||||
[features]
|
|
||||||
default = []
|
|
||||||
spirv = ["naga/spv-in"]
|
|
||||||
spirv-web = ["spirv", "naga/wgsl-out"]
|
|
||||||
trace = ["serde", "wgc/trace"]
|
|
||||||
replay = ["serde", "wgc/replay"]
|
|
||||||
webgl = ["wgc"]
|
|
||||||
|
|
||||||
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgc]
|
|
||||||
package = "wgpu-core"
|
|
||||||
path = "../wgpu-core"
|
|
||||||
version = "0.10"
|
|
||||||
features = ["raw-window-handle"]
|
|
||||||
|
|
||||||
[target.'cfg(target_arch = "wasm32")'.dependencies.wgc]
|
|
||||||
package = "wgpu-core"
|
|
||||||
path = "../wgpu-core"
|
|
||||||
version = "0.10"
|
|
||||||
features = ["raw-window-handle"]
|
|
||||||
optional = true
|
|
||||||
|
|
||||||
[dependencies.wgt]
|
|
||||||
package = "wgpu-types"
|
|
||||||
path = "../wgpu-types"
|
|
||||||
version = "0.10"
|
|
||||||
|
|
||||||
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.hal]
|
|
||||||
package = "wgpu-hal"
|
|
||||||
path = "../wgpu-hal"
|
|
||||||
version = "0.10"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
arrayvec = "0.7"
|
|
||||||
log = "0.4"
|
|
||||||
parking_lot = "0.11"
|
|
||||||
raw-window-handle = "0.3"
|
|
||||||
serde = { version = "1", features = ["derive"], optional = true }
|
|
||||||
smallvec = "1"
|
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
bitflags = "1"
|
|
||||||
bytemuck = { version = "1.4", features = ["derive"] }
|
|
||||||
cgmath = "0.18"
|
|
||||||
ddsfile = "0.4"
|
|
||||||
log = "0.4"
|
|
||||||
# Opt out of noise's "default-features" to avoid "image" feature as a dependency count optimization.
|
|
||||||
# This will not be required in the next release since it has been removed from the default feature in https://github.com/Razaekel/noise-rs/commit/1af9e1522236b2c584fb9a02150c9c67a5e6bb04#diff-2e9d962a08321605940b5a657135052fbcef87b5e360662bb527c96d9a615542
|
|
||||||
noise = { version = "0.7", default-features = false }
|
|
||||||
obj = "0.10"
|
|
||||||
png = "0.16"
|
|
||||||
rand = { version = "0.7.2", features = ["wasm-bindgen"] }
|
|
||||||
winit = { version = "0.25", features = ["web-sys"] }
|
|
||||||
|
|
||||||
[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
|
|
||||||
async-executor = "1.0"
|
|
||||||
pollster = "0.2"
|
|
||||||
env_logger = "0.8"
|
|
||||||
|
|
||||||
[dependencies.naga]
|
|
||||||
git = "https://github.com/gfx-rs/naga"
|
|
||||||
rev = "2e7d629"
|
|
||||||
#version = "0.6"
|
|
||||||
optional = true
|
|
||||||
|
|
||||||
# used to test all the example shaders
|
|
||||||
[dev-dependencies.naga]
|
|
||||||
git = "https://github.com/gfx-rs/naga"
|
|
||||||
rev = "2e7d629"
|
|
||||||
#version = "0.6"
|
|
||||||
features = ["wgsl-in"]
|
|
||||||
|
|
||||||
[[example]]
|
[[example]]
|
||||||
name="boids"
|
name="boids"
|
||||||
test = true
|
test = true
|
||||||
@ -146,6 +75,77 @@ test = true
|
|||||||
name="water"
|
name="water"
|
||||||
test = true
|
test = true
|
||||||
|
|
||||||
|
[features]
|
||||||
|
default = []
|
||||||
|
spirv = ["naga/spv-in"]
|
||||||
|
spirv-web = ["spirv", "naga/wgsl-out"]
|
||||||
|
trace = ["serde", "wgc/trace"]
|
||||||
|
replay = ["serde", "wgc/replay"]
|
||||||
|
webgl = ["wgc"]
|
||||||
|
|
||||||
|
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgc]
|
||||||
|
package = "wgpu-core"
|
||||||
|
path = "../wgpu-core"
|
||||||
|
version = "0.11"
|
||||||
|
features = ["raw-window-handle"]
|
||||||
|
|
||||||
|
[target.'cfg(target_arch = "wasm32")'.dependencies.wgc]
|
||||||
|
package = "wgpu-core"
|
||||||
|
path = "../wgpu-core"
|
||||||
|
version = "0.11"
|
||||||
|
features = ["raw-window-handle"]
|
||||||
|
optional = true
|
||||||
|
|
||||||
|
[dependencies.wgt]
|
||||||
|
package = "wgpu-types"
|
||||||
|
path = "../wgpu-types"
|
||||||
|
version = "0.11"
|
||||||
|
|
||||||
|
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.hal]
|
||||||
|
package = "wgpu-hal"
|
||||||
|
path = "../wgpu-hal"
|
||||||
|
version = "0.11"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
arrayvec = "0.7"
|
||||||
|
log = "0.4"
|
||||||
|
parking_lot = "0.11"
|
||||||
|
raw-window-handle = "0.3"
|
||||||
|
serde = { version = "1", features = ["derive"], optional = true }
|
||||||
|
smallvec = "1"
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
bitflags = "1"
|
||||||
|
bytemuck = { version = "1.4", features = ["derive"] }
|
||||||
|
cgmath = "0.18"
|
||||||
|
ddsfile = "0.4"
|
||||||
|
log = "0.4"
|
||||||
|
# Opt out of noise's "default-features" to avoid "image" feature as a dependency count optimization.
|
||||||
|
# This will not be required in the next release since it has been removed from the default feature in https://github.com/Razaekel/noise-rs/commit/1af9e1522236b2c584fb9a02150c9c67a5e6bb04#diff-2e9d962a08321605940b5a657135052fbcef87b5e360662bb527c96d9a615542
|
||||||
|
noise = { version = "0.7", default-features = false }
|
||||||
|
obj = "0.10"
|
||||||
|
png = "0.16"
|
||||||
|
rand = "0.7.2"
|
||||||
|
winit = "0.25"
|
||||||
|
|
||||||
|
[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
|
||||||
|
async-executor = "1.0"
|
||||||
|
pollster = "0.2"
|
||||||
|
env_logger = "0.8"
|
||||||
|
|
||||||
|
[dependencies.naga]
|
||||||
|
#git = "https://github.com/gfx-rs/naga"
|
||||||
|
#rev = "2e7d629"
|
||||||
|
version = "0.7"
|
||||||
|
optional = true
|
||||||
|
|
||||||
|
# used to test all the example shaders
|
||||||
|
[dev-dependencies.naga]
|
||||||
|
#git = "https://github.com/gfx-rs/naga"
|
||||||
|
#rev = "2e7d629"
|
||||||
|
version = "0.7"
|
||||||
|
features = ["wgsl-in"]
|
||||||
|
|
||||||
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
||||||
wasm-bindgen = "0.2.76" # remember to change version in wiki as well
|
wasm-bindgen = "0.2.76" # remember to change version in wiki as well
|
||||||
web-sys = { version = "0.3.53", features = [
|
web-sys = { version = "0.3.53", features = [
|
||||||
@ -282,3 +282,5 @@ console_error_panic_hook = "0.1.6"
|
|||||||
console_log = "0.1.2"
|
console_log = "0.1.2"
|
||||||
# We need the Location feature in the framework examples
|
# We need the Location feature in the framework examples
|
||||||
web-sys = { version = "0.3.53", features = ["Location"] }
|
web-sys = { version = "0.3.53", features = ["Location"] }
|
||||||
|
rand = { version = "0.7", features = ["wasm-bindgen"] }
|
||||||
|
winit = { version = "0.25", features = ["web-sys"] }
|
||||||
|
Loading…
Reference in New Issue
Block a user