Skip to content

Commit 595dd1b

Browse files
committed
use target-specs from spirv-builder
1 parent 60fb2e5 commit 595dd1b

18 files changed

+4
-457
lines changed

Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ exclude = [
1313
resolver = "2"
1414

1515
[workspace.dependencies]
16-
spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu.git", rev = "b619665a24eba00cc3d2d4b15af6d0fc356efef9", default-features = false }
16+
spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu.git", rev = "e040ab9c296f2c0f1555051d4b574969329715ec", default-features = false }
1717
anyhow = "1.0.94"
1818
clap = { version = "4.5.37", features = ["derive"] }
1919
chrono = { version = "0.4.38", default-features = false, features = ["std"] }

crates/cargo-gpu/src/install.rs

+1-64
Original file line numberDiff line numberDiff line change
@@ -7,73 +7,10 @@ use crate::spirv_source::{
77
use crate::{cache_dir, spirv_source::SpirvSource, target_spec_dir};
88
use anyhow::Context as _;
99
use log::trace;
10+
use spirv_builder::TARGET_SPECS;
1011
use std::io::Write as _;
1112
use std::path::{Path, PathBuf};
1213

13-
/// Metadata for the compile targets supported by `rust-gpu`
14-
const TARGET_SPECS: &[(&str, &str)] = &[
15-
(
16-
"spirv-unknown-opengl4.0.json",
17-
include_str!("../target-specs/spirv-unknown-opengl4.0.json"),
18-
),
19-
(
20-
"spirv-unknown-opengl4.1.json",
21-
include_str!("../target-specs/spirv-unknown-opengl4.1.json"),
22-
),
23-
(
24-
"spirv-unknown-opengl4.2.json",
25-
include_str!("../target-specs/spirv-unknown-opengl4.2.json"),
26-
),
27-
(
28-
"spirv-unknown-opengl4.3.json",
29-
include_str!("../target-specs/spirv-unknown-opengl4.3.json"),
30-
),
31-
(
32-
"spirv-unknown-opengl4.5.json",
33-
include_str!("../target-specs/spirv-unknown-opengl4.5.json"),
34-
),
35-
(
36-
"spirv-unknown-spv1.0.json",
37-
include_str!("../target-specs/spirv-unknown-spv1.0.json"),
38-
),
39-
(
40-
"spirv-unknown-spv1.1.json",
41-
include_str!("../target-specs/spirv-unknown-spv1.1.json"),
42-
),
43-
(
44-
"spirv-unknown-spv1.2.json",
45-
include_str!("../target-specs/spirv-unknown-spv1.2.json"),
46-
),
47-
(
48-
"spirv-unknown-spv1.3.json",
49-
include_str!("../target-specs/spirv-unknown-spv1.3.json"),
50-
),
51-
(
52-
"spirv-unknown-spv1.4.json",
53-
include_str!("../target-specs/spirv-unknown-spv1.4.json"),
54-
),
55-
(
56-
"spirv-unknown-spv1.5.json",
57-
include_str!("../target-specs/spirv-unknown-spv1.5.json"),
58-
),
59-
(
60-
"spirv-unknown-vulkan1.0.json",
61-
include_str!("../target-specs/spirv-unknown-vulkan1.0.json"),
62-
),
63-
(
64-
"spirv-unknown-vulkan1.1.json",
65-
include_str!("../target-specs/spirv-unknown-vulkan1.1.json"),
66-
),
67-
(
68-
"spirv-unknown-vulkan1.1spv1.4.json",
69-
include_str!("../target-specs/spirv-unknown-vulkan1.1spv1.4.json"),
70-
),
71-
(
72-
"spirv-unknown-vulkan1.2.json",
73-
include_str!("../target-specs/spirv-unknown-vulkan1.2.json"),
74-
),
75-
];
76-
7714
/// `cargo gpu install`
7815
#[derive(clap::Parser, Debug, serde::Deserialize, serde::Serialize)]
7916
pub struct Install {

crates/cargo-gpu/target-specs/spirv-unknown-opengl4.0.json

-26
This file was deleted.

crates/cargo-gpu/target-specs/spirv-unknown-opengl4.1.json

-26
This file was deleted.

crates/cargo-gpu/target-specs/spirv-unknown-opengl4.2.json

-26
This file was deleted.

crates/cargo-gpu/target-specs/spirv-unknown-opengl4.3.json

-26
This file was deleted.

crates/cargo-gpu/target-specs/spirv-unknown-opengl4.5.json

-26
This file was deleted.

crates/cargo-gpu/target-specs/spirv-unknown-spv1.0.json

-26
This file was deleted.

crates/cargo-gpu/target-specs/spirv-unknown-spv1.1.json

-26
This file was deleted.

crates/cargo-gpu/target-specs/spirv-unknown-spv1.2.json

-26
This file was deleted.

crates/cargo-gpu/target-specs/spirv-unknown-spv1.3.json

-26
This file was deleted.

crates/cargo-gpu/target-specs/spirv-unknown-spv1.4.json

-26
This file was deleted.

crates/cargo-gpu/target-specs/spirv-unknown-spv1.5.json

-26
This file was deleted.

0 commit comments

Comments
 (0)