nordic-dev.net/rust-gpu
2
0
Fork 0
mirror of https://github.com/EmbarkStudios/rust-gpu.git synced 2024-11-25 00:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Applied workspace inheritance

Browse Source
This commit is contained in:
Sylvester Hesp 2022-11-22 15:28:53 +01:00
parent 39850120ae
commit e7df2feb27
20 changed files with 121 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
### Changed 🛠️
- Applied workspace inheritance to Cargo.toml files
## [0.4.0-alpha.17]
### Changed 🛠️

18
Cargo.toml
View File

@ -23,6 +23,21 @@ members = [
"tests/deps-helper",
]
[workspace.package]
version = "0.4.0-alpha.17"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
repository = "https://github.com/EmbarkStudios/rust-gpu"
[workspace.dependencies]
spirv-std = { path = "./crates/spirv-std", version = "=0.4.0-alpha.17" }
spirv-std-types = { path = "./crates/spirv-std/shared", version = "=0.4.0-alpha.17" }
spirv-std-macros = { path = "./crates/spirv-std/macros", version = "=0.4.0-alpha.17" }
spirv-builder = { path = "./crates/spirv-builder", version = "=0.4.0-alpha.17" }
rustc_codegen_spirv = { path = "./crates/rustc_codegen_spirv", version = "=0.4.0-alpha.17", default-features = false }
rustc_codegen_spirv-types = { path = "./crates/rustc_codegen_spirv-types", version = "=0.4.0-alpha.17" }
# Enable incremental by default in release mode.
[profile.release]
incremental = true
@ -39,8 +54,7 @@ incremental = true
codegen-units = 256
[patch.crates-io]
spirv-std = { path = "./crates/spirv-std" }
spirv-std-macros = { path = "./crates/spirv-std/macros" }
# HACK(eddyb) needed to include this PR (until it's part of a release):
# * Manishearth/compiletest-rs#249 (for `// only-*` support)
# [shesp] The commit is part of 0.8 release. We can remove this once we upgrade `compiletest`.
compiletest_rs = { git = "https://github.com/Manishearth/compiletest-rs.git", rev = "4ab843a1dc6ed9a82657d86d22397c6c5bb95b01" }

10
crates/rustc_codegen_spirv-types/Cargo.toml
View File

@ -1,11 +1,11 @@
[package]
name = "rustc_codegen_spirv-types"
description = "SPIR-V backend types shared between rustc_codegen_spirv and spirv-builder"
version = "0.4.0-alpha.17"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
repository = "https://github.com/EmbarkStudios/rust-gpu"
version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
[dependencies]
rspirv = "0.11"

15
crates/rustc_codegen_spirv/Cargo.toml
View File

@ -1,14 +1,11 @@
[package]
name = "rustc_codegen_spirv"
version = "0.4.0-alpha.17"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
repository = "https://github.com/EmbarkStudios/rust-gpu"
description = "SPIR-V code generator backend for rustc"
#keywords = []
#categories = []
#readme = "README.md"
version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
[lib]
crate-type = ["dylib"]
@ -59,7 +56,7 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
smallvec = { version = "1.6.1", features = ["union"] }
spirv-tools = { version = "0.9", default-features = false }
rustc_codegen_spirv-types = { path = "../rustc_codegen_spirv-types", version = "=0.4.0-alpha.17" }
rustc_codegen_spirv-types.workspace = true
[dev-dependencies]
pipe = "0.4"

16
crates/spirv-builder/Cargo.toml
View File

@ -1,11 +1,11 @@
[package]
name = "spirv-builder"
version = "0.4.0-alpha.17"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
repository = "https://github.com/EmbarkStudios/rust-gpu"
description = "Helper for building shaders with rust-gpu"
version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
# See rustc_codegen_spirv/Cargo.toml for details on these features
[features]
@ -16,12 +16,12 @@ skip-toolchain-check = ["rustc_codegen_spirv/skip-toolchain-check"]
watch = ["notify"]
[dependencies]
rustc_codegen_spirv-types.workspace = true
# See comment in lib.rs invoke_rustc for why this is here
rustc_codegen_spirv = { workspace = true }
memchr = "2.4"
raw-string = "0.3.5"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
rustc_codegen_spirv-types = { path = "../rustc_codegen_spirv-types", version = "=0.4.0-alpha.17" }
# See comment in lib.rs invoke_rustc for why this is here
rustc_codegen_spirv = { path = "../rustc_codegen_spirv", version = "=0.4.0-alpha.17", default-features = false }
notify = { version = "5.0.0-pre.11", optional = true }

14
crates/spirv-std/Cargo.toml
View File

@ -1,17 +1,17 @@
[package]
name = "spirv-std"
version = "0.4.0-alpha.17"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
repository = "https://github.com/EmbarkStudios/rust-gpu"
description = "Standard functions and types for SPIR-V"
version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
[dependencies]
spirv-std-types.workspace = true
spirv-std-macros.workspace = true
bitflags = "1.2.1"
num-traits = { version = "0.2.14", default-features = false, features = ["libm"] }
spirv-std-types = { path = "./shared", version = "=0.4.0-alpha.17" }
spirv-std-macros = { path = "./macros", version = "=0.4.0-alpha.17" }
glam = { version = "0.22", default-features = false, features = ["libm"], optional = true }
[features]

14
crates/spirv-std/macros/Cargo.toml
View File

@ -1,17 +1,17 @@
[package]
name = "spirv-std-macros"
version = "0.4.0-alpha.17"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
repository = "https://github.com/EmbarkStudios/rust-gpu"
description = "Macros for spirv-std"
version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
[lib]
proc-macro = true
[dependencies]
spirv-std-types = { path = "../shared", version = "=0.4.0-alpha.17" }
spirv-std-types.workspace = true
proc-macro2 = "1.0.24"
quote = "1.0.8"
syn = { version = "1.0.58", features=["full"] }
syn = { version = "1.0.58", features = ["full"] }

10
crates/spirv-std/shared/Cargo.toml
View File

@ -1,8 +1,8 @@
[package]
name = "spirv-std-types"
description = "SPIR-V types shared between spirv-std and spirv-std-macros"
version = "0.4.0-alpha.17"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
repository = "https://github.com/EmbarkStudios/rust-gpu"
version.workspace = true
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true

9
examples/multibuilder/Cargo.toml
View File

@ -1,10 +1,11 @@
[package]
name = "multibuilder"
version = "0.0.0"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
publish = false
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
# See rustc_codegen_spirv/Cargo.toml for details on these features
[features]
@ -13,4 +14,4 @@ use-installed-tools = ["spirv-builder/use-installed-tools"]
use-compiled-tools = ["spirv-builder/use-compiled-tools"]
[dependencies]
spirv-builder = { path = "../../crates/spirv-builder", default-features = false }
spirv-builder = { workspace = true, default-features = false }

9
examples/runners/ash/Cargo.toml
View File

@ -1,10 +1,11 @@
[package]
name = "example-runner-ash"
version = "0.0.0"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
publish = false
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
# See rustc_codegen_spirv/Cargo.toml for details on these features
[features]
@ -19,7 +20,7 @@ winit = "0.26"
structopt = "0.3.20"
cfg-if = "1.0.0"
shared = { path = "../../shaders/shared" }
spirv-builder = { path = "../../../crates/spirv-builder", default-features = false }
spirv-builder = { workspace = true, default-features = false }
# TODO: Remove this once no longer needed, only needed to make cargo-deny happy for some reason.
# https://rustsec.org/advisories/RUSTSEC-2021-0119

9
examples/runners/wgpu/Cargo.toml
View File

@ -1,10 +1,11 @@
[package]
name = "example-runner-wgpu"
version = "0.0.0"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
publish = false
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
[lib]
crate-type = ["lib", "cdylib"]
@ -27,7 +28,7 @@ strum = { version = "0.23.0", default_features = false, features = ["std", "deri
bytemuck = "1.6.3"
[target.'cfg(not(any(target_os = "android", target_arch = "wasm32")))'.dependencies]
spirv-builder = { path = "../../../crates/spirv-builder", default-features = false, features = ["watch"] }
spirv-builder = { workspace = true, default-features = false, features = ["watch"] }
[target.'cfg(target_os = "android")'.dependencies]
ndk-glue = "0.4"

9
examples/runners/wgpu/builder/Cargo.toml
View File

@ -1,10 +1,11 @@
[package]
name = "example-runner-wgpu-builder"
version = "0.0.0"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
publish = false
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
# See rustc_codegen_spirv/Cargo.toml for details on these features
[features]
@ -13,4 +14,4 @@ use-installed-tools = ["spirv-builder/use-installed-tools"]
use-compiled-tools = ["spirv-builder/use-compiled-tools"]
[dependencies]
spirv-builder = { path = "../../../../crates/spirv-builder", default-features = false }
spirv-builder = { workspace = true, default-features = false }

9
examples/shaders/compute-shader/Cargo.toml
View File

@ -1,16 +1,17 @@
[package]
name = "compute-shader"
version = "0.0.0"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
publish = false
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
[lib]
crate-type = ["dylib", "lib"]
[dependencies]
spirv-std = { path = "../../../crates/spirv-std", features = ["glam"] }
spirv-std = { workspace = true, features = ["glam"] }
[target.'cfg(not(target_arch = "spirv"))'.dependencies]
rayon = "1.5"

9
examples/shaders/mouse-shader/Cargo.toml
View File

@ -1,14 +1,15 @@
[package]
name = "mouse-shader"
version = "0.0.0"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
publish = false
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
[lib]
crate-type = ["dylib"]
[dependencies]
shared = { path = "../../shaders/shared" }
spirv-std = { path = "../../../crates/spirv-std", features = ["glam"] }
spirv-std = { workspace = true, features = ["glam"] }

9
examples/shaders/reduce/Cargo.toml
View File

@ -1,13 +1,14 @@
[package]
name = "reduce"
version = "0.0.0"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
publish = false
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
[lib]
crate-type = ["dylib", "lib"]
[dependencies]
spirv-std = { path = "../../../crates/spirv-std", features = ["glam"] }
spirv-std = { workspace = true, features = ["glam"] }

9
examples/shaders/shared/Cargo.toml
View File

@ -1,11 +1,12 @@
[package]
name = "shared"
version = "0.0.0"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
publish = false
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
[dependencies]
spirv-std = { path = "../../../crates/spirv-std", features = ["glam"] }
spirv-std = { workspace = true, features = ["glam"] }
bytemuck = { version = "1.6.3", features = ["derive"] }

9
examples/shaders/simplest-shader/Cargo.toml
View File

@ -1,14 +1,15 @@
[package]
name = "simplest-shader"
version = "0.0.0"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
publish = false
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
[lib]
crate-type = ["dylib"]
[dependencies]
spirv-std = { path = "../../../crates/spirv-std", features = ["glam"] }
spirv-std = { workspace = true, features = ["glam"] }
shared = { path = "../shared" }

9
examples/shaders/sky-shader/Cargo.toml
View File

@ -1,14 +1,15 @@
[package]
name = "sky-shader"
version = "0.0.0"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
publish = false
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
[lib]
crate-type = ["lib", "dylib"]
[dependencies]
shared = { path = "../../shaders/shared" }
spirv-std = { path = "../../../crates/spirv-std", features = ["glam"] }
spirv-std = { workspace = true, features = ["glam"] }

9
tests/Cargo.toml
View File

@ -1,10 +1,11 @@
[package]
name = "compiletests"
version = "0.0.0"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
publish = false
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
# See rustc_codegen_spirv/Cargo.toml for details on these features
[features]
@ -14,5 +15,5 @@ use-compiled-tools = ["rustc_codegen_spirv/use-compiled-tools"]
[dependencies]
compiletest = { version = "0.7.0", package = "compiletest_rs" }
rustc_codegen_spirv = { path = "../crates/rustc_codegen_spirv", version = "=0.4.0-alpha.17", default-features = false }
rustc_codegen_spirv = { workspace = true }
structopt = "0.3.21"

11
tests/deps-helper/Cargo.toml
View File

@ -1,11 +1,12 @@
[package]
name = "compiletests-deps-helper"
version = "0.0.0"
description = "Shared dependencies of all the compiletest tests"
authors = ["Embark <opensource@embark-studios.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
version = "0.0.0"
publish = false
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
[dependencies]
spirv-std = { path = "../../crates/spirv-std", features = ["glam"] }
spirv-std = { workspace = true, features = ["glam"] }