Skip to content

Commit 08e89f1

Browse files
committed
move spirv-tools into a subdirectory
1 parent 71f8f34 commit 08e89f1

27 files changed

+312
-51
lines changed

Cargo.lock

Lines changed: 246 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 8 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,24 @@
11
[workspace]
22
members = [
3+
"spirv-tools",
34
"spirv-tools-sys",
5+
"examples/assembler",
46
"tools/generate",
57
]
8+
resolver = "2"
69

7-
[package]
8-
name = "spirv-tools"
10+
[workspace.package]
911
description = "Wrapper crate for SPIRV-Tools"
1012
repository = "https://github.com/rust-gpu/spirv-tools-rs"
1113
version = "0.12.2"
12-
authors = ["Embark <[email protected]>"]
14+
authors = ["rust-gpu developers", "Embark <[email protected]>"]
1315
edition = "2024"
1416
license = "MIT OR Apache-2.0"
15-
readme = "README.md"
1617
documentation = "https://docs.rs/spirv-tools"
1718
homepage = "https://github.com/rust-gpu/spirv-tools-rs"
1819
keywords = ["spir-v", "rust-gpu"]
1920
categories = ["rendering::data-formats"]
20-
exclude = [".github", "release.toml"]
2121

22-
[features]
23-
default = ["use-compiled-tools"]
24-
use-installed-tools = [
25-
"spirv-tools-sys/use-installed-tools",
26-
"memchr",
27-
"tempfile",
28-
]
29-
use-compiled-tools = ["spirv-tools-sys/use-compiled-tools"]
30-
31-
[dependencies]
32-
spirv-tools-sys = { version = "0.12", path = "./spirv-tools-sys", default-features = false }
33-
# Used for parsing output when running binaries
34-
memchr = { version = "2.3", optional = true }
35-
tempfile = { version = "3.1", optional = true }
36-
37-
[dev-dependencies]
38-
similar = "2.0"
39-
40-
[[test]]
41-
name = "optimizer"
42-
required-features = ["use-compiled-tools", "use-installed-tools"]
43-
44-
[[test]]
45-
name = "assembler"
46-
required-features = ["use-compiled-tools", "use-installed-tools"]
47-
48-
[[test]]
49-
name = "issue_22"
50-
required-features = ["use-compiled-tools", "use-installed-tools"]
22+
[workspace.dependencies]
23+
spirv-tools = { path = "spirv-tools", default-features = false }
24+
spirv-tools-sys = { path = "spirv-tools-sys", default-features = false }

examples/assembler/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[package]
22
name = "assembler"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition.workspace = true
5+
publish = false
56

67
[dependencies]
78
clap = { version = "4.4", features = ["derive"] }
8-
spirv-tools = { path = "../../", features = ["use-compiled-tools"] }
9+
spirv-tools = { workspace = true, features = ["use-compiled-tools"] }

0 commit comments

Comments
 (0)