Skip to content

Commit

Permalink
Move out spirv-tools to separate repo (#237)
Browse files Browse the repository at this point in the history
* Nuke spirv-tools

* Swap to use published spirv-tools crate
  • Loading branch information
Jake-Shadle committed Nov 13, 2020
1 parent e261b88 commit 0f3948d
Show file tree
Hide file tree
Showing 55 changed files with 7 additions and 6,233 deletions.
3 changes: 0 additions & 3 deletions .gitattributes
@@ -1,5 +1,2 @@
# configure GitHub linguist (language bar) https://github.com/github/linguist#overrides
docs/* linguist-documentation
crates/spirv-tools-sys/spirv-headers/* linguist-vendored
crates/spirv-tools-sys/spirv-tools/* linguist-vendored
crates/spirv-tools-sys/generated/* linguist-generated
2 changes: 0 additions & 2 deletions .github/workflows/clippy.sh
Expand Up @@ -28,8 +28,6 @@ function clippy_no_features() {
}

# Core crates
clippy crates/spirv-tools-sys
clippy crates/spirv-tools
clippy crates/rustc_codegen_spirv
clippy crates/spirv-builder

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/docs.sh
Expand Up @@ -18,7 +18,5 @@ function doc() {

# Core crates only!
cargo doc --manifest-path "crates/spirv-std/Cargo.toml"
doc crates/spirv-tools-sys
doc crates/spirv-tools
doc crates/rustc_codegen_spirv
doc crates/spirv-builder
2 changes: 0 additions & 2 deletions .github/workflows/test.sh
Expand Up @@ -37,8 +37,6 @@ function cargo_test_no_features() {
}

# Core crates
cargo_test crates/spirv-tools-sys
cargo_test crates/spirv-tools
cargo_test crates/rustc_codegen_spirv
cargo_test crates/spirv-builder

Expand Down
7 changes: 0 additions & 7 deletions .gitmodules

This file was deleted.

5 changes: 4 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
Expand Up @@ -7,9 +7,8 @@ members = [
"examples/shaders/sky-shader",
"examples/shaders/simplest-shader",
"examples/shaders/compute-shader",

"crates/rustc_codegen_spirv",
"crates/spirv-builder",
"crates/spirv-std",
"crates/spirv-tools",
"crates/spirv-tools-sys",
]
6 changes: 1 addition & 5 deletions crates/rustc_codegen_spirv/Cargo.toml
Expand Up @@ -29,14 +29,10 @@ use-compiled-tools = ["spirv-tools/use-compiled-tools"]
[dependencies]
bimap = "0.5"
rspirv = { git = "https://github.com/gfx-rs/rspirv.git", rev = "f11f8797bd4df2d1d22cf10767b39a5119c57551" }
spirv-tools = { version = "0.1.0", default-features = false }
tar = "0.4.30"
topological-sort = "0.1"

[dependencies.spirv-tools]
version = "0.1.0"
path = "../spirv-tools"
default-features = false

[dev-dependencies]
pipe = "0.3"
pretty_assertions = "0.6"
Expand Down
18 changes: 0 additions & 18 deletions crates/spirv-tools-sys/Cargo.toml

This file was deleted.

0 comments on commit 0f3948d

Please sign in to comment.