From 97f44e8915fc7f75522154091441addb6a8c1a1f Mon Sep 17 00:00:00 2001 From: firestar99 Date: Tue, 21 Apr 2026 12:29:02 +0200 Subject: [PATCH 1/3] rust-gpu alpha.1: update nix flake --- .nix/dev.nix | 1 - .nix/pkgs/graphite.nix | 1 - flake.lock | 18 +++++++++--------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.nix/dev.nix b/.nix/dev.nix index e9333d4940..c51607b17f 100644 --- a/.nix/dev.nix +++ b/.nix/dev.nix @@ -22,7 +22,6 @@ pkgs.mkShell ( pkgs.lld pkgs.nodejs - pkgs.nodePackages.npm pkgs.binaryen pkgs.wasm-bindgen-cli_0_2_100 pkgs.wasm-pack diff --git a/.nix/pkgs/graphite.nix b/.nix/pkgs/graphite.nix index cf8b12910f..e143dcbb0e 100644 --- a/.nix/pkgs/graphite.nix +++ b/.nix/pkgs/graphite.nix @@ -82,7 +82,6 @@ deps.crane.lib.buildPackage ( pkgs.pkg-config pkgs.lld pkgs.nodejs - pkgs.nodePackages.npm pkgs.binaryen pkgs.wasm-bindgen-cli_0_2_100 pkgs.wasm-pack diff --git a/flake.lock b/flake.lock index fbc34b8adb..2f8755d770 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1770169865, - "narHash": "sha256-iPiy13xzDQ9GjpOez+NNIjh/qjl7i4RDf9dF2x5mF9I=", + "lastModified": 1776635034, + "narHash": "sha256-OEOJrT3ZfwbChzODfIH4GzlNTtOFuZFWPtW7jIeR8xU=", "owner": "ipetkov", "repo": "crane", - "rev": "8254ccf3b5b5131890ee073776f2e61c6d1e55d4", + "rev": "dc7496d8ea6e526b1254b55d09b966e94673750f", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1770347142, - "narHash": "sha256-uz+ZSqXpXEPtdRPYwvgsum/CfNq7AUQ/0gZHqTigiPM=", + "lastModified": 1776741231, + "narHash": "sha256-k9G98qzn+7npROUaks8VqCFm7cFtEG8ulQLBBo5lItg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2859683cd9ef7858d324c5399b0d8d6652bf4044", + "rev": "02061303f7c4c964f7b4584dabd9e985b4cd442b", "type": "github" }, "original": { From 9e2a274453a5190df04a511c1b70fd5e874a96a9 Mon Sep 17 00:00:00 2001 From: firestar99 Date: Tue, 21 Apr 2026 12:29:02 +0200 Subject: [PATCH 2/3] rust-gpu alpha.1: disable non-working mold shell hook --- .nix/dev.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.nix/dev.nix b/.nix/dev.nix index c51607b17f..da077135de 100644 --- a/.nix/dev.nix +++ b/.nix/dev.nix @@ -54,9 +54,9 @@ pkgs.mkShell ( LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath libs}:${deps.cef.env.CEF_PATH}"; XDG_DATA_DIRS = "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}:$XDG_DATA_DIRS"; - shellHook = '' - alias cargo='mold --run cargo' - ''; +# shellHook = '' +# alias cargo='mold --run cargo' +# ''; } // deps.cef.env // deps.rustGPU.env From adee7fc46f66de2faab8d546b760d129b60de99d Mon Sep 17 00:00:00 2001 From: firestar99 Date: Tue, 21 Apr 2026 12:29:02 +0200 Subject: [PATCH 3/3] rust-gpu alpha.1: update rust-gpu to `0.10.0-alpha.1` on crates --- .nix/deps/rust-gpu.nix | 16 +- Cargo.lock | 216 +++--------------- Cargo.toml | 6 +- libraries/dyn-any/Cargo.toml | 2 +- .../src/shaders/buffer_struct/glam.rs | 2 - .../src/shaders/buffer_struct/primitive.rs | 1 - node-graph/nodes/raster/shaders/Cargo.toml | 5 +- node-graph/nodes/raster/shaders/build.rs | 9 +- .../shaders/spirv-unknown-naga-wgsl.json | 26 --- 9 files changed, 43 insertions(+), 240 deletions(-) delete mode 100644 node-graph/nodes/raster/shaders/spirv-unknown-naga-wgsl.json diff --git a/.nix/deps/rust-gpu.nix b/.nix/deps/rust-gpu.nix index a44f70b368..db6d9eff63 100644 --- a/.nix/deps/rust-gpu.nix +++ b/.nix/deps/rust-gpu.nix @@ -9,7 +9,7 @@ let "rustc-dev" "llvm-tools" ]; - toolchain = pkgs.rust-bin.nightly."2025-06-23".default.override { + toolchain = pkgs.rust-bin.nightly."2026-04-11".default.override { inherit extensions; }; cargo = pkgs.writeShellScriptBin "cargo" '' @@ -30,16 +30,14 @@ let cargo = toolchain; rustc = toolchain; }).buildRustPackage - (finalAttrs: { + (finalAttrs: rec { pname = "rustc_codegen_spirv"; - version = "0-unstable-2025-08-04"; - src = pkgs.fetchFromGitHub { - owner = "Firestar99"; - repo = "rust-gpu-new"; - rev = "c12f216121820580731440ee79ebc7403d6ea04f"; - hash = "sha256-rG1cZvOV0vYb1dETOzzbJ0asYdE039UZImobXZfKIno="; + version = "0.10.0-alpha.1"; + src = pkgs.fetchCrate { + inherit pname version; + sha256 = "sha256-zJEpExkPgYzwo7fR4ge4GxJNj7H5yo4bJ4eTOw36+7c="; }; - cargoHash = "sha256-AEigcEc5wiBd3zLqWN/2HSbkfOVFneAqNvg9HsouZf4="; + cargoHash = "sha256-J1rtbfGqrL2NJ7Bu2pYfDwCdUmnECB/kzxrpYluA0kY="; cargoBuildFlags = [ "-p" "rustc_codegen_spirv" diff --git a/Cargo.lock b/Cargo.lock index 33df1cdfc7..ac3ee91245 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -445,22 +445,16 @@ dependencies = [ ] [[package]] -name = "cargo-gpu" -version = "0.1.0" -source = "git+https://github.com/Firestar99/cargo-gpu?rev=3952a22d16edbd38689f3a876e417899f21e1fe7#3952a22d16edbd38689f3a876e417899f21e1fe7" +name = "cargo-gpu-install" +version = "0.10.0-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82bad075de69e455c338955b4a7d58c0ced253185ef7703a3c6a3846e2d5ee66" dependencies = [ "anyhow", "cargo_metadata", - "clap", - "crossterm", "directories", - "dunce", - "env_logger", "log", - "relative-path", - "semver", "serde", - "serde_json", "spirv-builder", ] @@ -779,15 +773,6 @@ dependencies = [ "windows-sys 0.60.2", ] -[[package]] -name = "convert_case" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "convert_case" version = "0.8.0" @@ -999,33 +984,6 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" -[[package]] -name = "crossterm" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" -dependencies = [ - "bitflags 2.11.0", - "crossterm_winapi", - "derive_more", - "document-features", - "mio", - "parking_lot", - "rustix", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - [[package]] name = "crunchy" version = "0.2.4" @@ -1136,7 +1094,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" dependencies = [ - "convert_case 0.7.1", "proc-macro2", "quote", "syn 2.0.106", @@ -1602,15 +1559,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - [[package]] name = "futf" version = "0.1.5" @@ -1806,13 +1754,13 @@ dependencies = [ [[package]] name = "glam" -version = "0.29.3" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8babf46d4c1c9d92deac9f7be466f76dfc4482b6452fc5024b5e8daf6ffeb3ee" +checksum = "f70749695b063ecbf6b62949ccccde2e733ec3ecbbd71d467dca4e5c6c97cca0" dependencies = [ "bytemuck", "libm", - "serde", + "serde_core", ] [[package]] @@ -2675,26 +2623,6 @@ dependencies = [ "rustversion", ] -[[package]] -name = "inotify" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" -dependencies = [ - "bitflags 2.11.0", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - [[package]] name = "interpreted-executor" version = "0.1.0" @@ -2875,26 +2803,6 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" -[[package]] -name = "kqueue" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - [[package]] name = "kurbo" version = "0.13.0" @@ -3164,7 +3072,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ "libc", - "log", "wasi 0.11.1+wasi-snapshot-preview1", "windows-sys 0.59.0", ] @@ -3301,7 +3208,7 @@ dependencies = [ name = "node-docs" version = "0.0.0" dependencies = [ - "convert_case 0.8.0", + "convert_case", "graph-craft", "graphene-std", "indoc", @@ -3313,7 +3220,7 @@ dependencies = [ name = "node-macro" version = "0.0.0" dependencies = [ - "convert_case 0.8.0", + "convert_case", "core-types", "indoc", "no-std-types", @@ -3325,30 +3232,6 @@ dependencies = [ "syn 2.0.106", ] -[[package]] -name = "notify" -version = "8.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" -dependencies = [ - "bitflags 2.11.0", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log", - "mio", - "notify-types", - "walkdir", - "windows-sys 0.60.2", -] - -[[package]] -name = "notify-types" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d" - [[package]] name = "nu-ansi-term" version = "0.50.1" @@ -4329,7 +4212,7 @@ dependencies = [ name = "raster-nodes-shaders" version = "0.1.0" dependencies = [ - "cargo-gpu", + "cargo-gpu-install", "env_logger", "log", ] @@ -4467,15 +4350,6 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" -[[package]] -name = "relative-path" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca40a312222d8ba74837cb474edef44b37f561da5f773981007a10bbaa992b0" -dependencies = [ - "serde", -] - [[package]] name = "renderdoc-sys" version = "1.1.0" @@ -4658,25 +4532,18 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" -[[package]] -name = "rustc_codegen_spirv-target-specs" -version = "0.9.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=c12f216121820580731440ee79ebc7403d6ea04f#3f05f5482824e3b1fbb44c9ef90a8795a0204c7c" -dependencies = [ - "serde", - "strum", - "thiserror 2.0.18", -] - [[package]] name = "rustc_codegen_spirv-types" -version = "0.9.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=c12f216121820580731440ee79ebc7403d6ea04f#3f05f5482824e3b1fbb44c9ef90a8795a0204c7c" +version = "0.10.0-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ac3a589ac4bf0931b69299679803063986f280a2b82ace70e7f8b2d0db0dec2" dependencies = [ "rspirv", + "semver", "serde", "serde_json", "spirv", + "thiserror 2.0.18", ] [[package]] @@ -5062,36 +4929,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "signal-hook" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" -dependencies = [ - "libc", -] - [[package]] name = "simd-adler32" version = "0.3.7" @@ -5247,16 +5084,14 @@ dependencies = [ [[package]] name = "spirv-builder" -version = "0.9.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=c12f216121820580731440ee79ebc7403d6ea04f#3f05f5482824e3b1fbb44c9ef90a8795a0204c7c" +version = "0.10.0-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b721e6d7d7bc999126e838d16b070c8beada89ff8251c3f8a9e5292102827d86" dependencies = [ "cargo_metadata", - "clap", "log", "memchr", - "notify", "raw-string", - "rustc_codegen_spirv-target-specs", "rustc_codegen_spirv-types", "semver", "serde", @@ -5266,8 +5101,9 @@ dependencies = [ [[package]] name = "spirv-std" -version = "0.9.0" -source = "git+https://github.com/Firestar99/rust-gpu-new?rev=c12f216121820580731440ee79ebc7403d6ea04f#c12f216121820580731440ee79ebc7403d6ea04f" +version = "0.10.0-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68cdc5ca01151f2627fdf1cff34bf6452f5dc212a6d09f4aa5a9b4f17e9bc8e3" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -5280,8 +5116,9 @@ dependencies = [ [[package]] name = "spirv-std-macros" -version = "0.9.0" -source = "git+https://github.com/Firestar99/rust-gpu-new?rev=c12f216121820580731440ee79ebc7403d6ea04f#c12f216121820580731440ee79ebc7403d6ea04f" +version = "0.10.0-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b8538ad79b81964125710a912c46f3ea71c4f5732bab5d24d506b86ea8fde0" dependencies = [ "proc-macro2", "quote", @@ -5291,8 +5128,9 @@ dependencies = [ [[package]] name = "spirv-std-types" -version = "0.9.0" -source = "git+https://github.com/Firestar99/rust-gpu-new?rev=c12f216121820580731440ee79ebc7403d6ea04f#c12f216121820580731440ee79ebc7403d6ea04f" +version = "0.10.0-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b7ffce7843c3a9f5d5d2b9c21402d4cd026c26780b2f16a3cd6de3e6436230" [[package]] name = "stable_deref_trait" diff --git a/Cargo.toml b/Cargo.toml index b97a288f75..dc88c3dc78 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -159,7 +159,7 @@ polycool = "0.4" # Linebender ecosystem (END) rand = { version = "0.9", default-features = false, features = ["std_rng"] } rand_chacha = "0.9" -glam = { version = "0.29", default-features = false, features = [ +glam = { version = "0.32.1", default-features = false, features = [ "nostd-libm", "scalar-math", "bytemuck", @@ -206,8 +206,8 @@ rfd = "0.17" open = "5.3" spin = "0.10" clap = "4.5" -spirv-std = { git = "https://github.com/Firestar99/rust-gpu-new", rev = "c12f216121820580731440ee79ebc7403d6ea04f", features = ["bytemuck"] } -cargo-gpu = { git = "https://github.com/Firestar99/cargo-gpu", rev = "3952a22d16edbd38689f3a876e417899f21e1fe7", default-features = false } +spirv-std = { version = "0.10.0-alpha.1", features = ["bytemuck"] } +cargo-gpu-install = { version = "0.10.0-alpha.1", default-features = false } qrcodegen = "1.8" lzma-rust2 = { version = "0.16", default-features = false, features = ["std", "encoder", "optimization", "xz"] } scraper = "0.25" diff --git a/libraries/dyn-any/Cargo.toml b/libraries/dyn-any/Cargo.toml index 3b72d5027f..f5deb6f10c 100644 --- a/libraries/dyn-any/Cargo.toml +++ b/libraries/dyn-any/Cargo.toml @@ -28,7 +28,7 @@ glam = ["dep:glam"] dyn-any-derive = { path = "derive", optional = true } # Optional dependencies -glam = { version = "0.29", optional = true, default-features = false } +glam = { version = "0.32.1", optional = true, default-features = false } reqwest = { version = "0.13", optional = true, default-features = false } [package.metadata.docs.rs] diff --git a/node-graph/libraries/no-std-types/src/shaders/buffer_struct/glam.rs b/node-graph/libraries/no-std-types/src/shaders/buffer_struct/glam.rs index 568f017045..b168060133 100644 --- a/node-graph/libraries/no-std-types/src/shaders/buffer_struct/glam.rs +++ b/node-graph/libraries/no-std-types/src/shaders/buffer_struct/glam.rs @@ -40,7 +40,6 @@ glam_array!(glam::Vec2, [f32; 2]); glam_array!(glam::Vec3, [f32; 3]); // glam_array!(Vec3A, [f32; 4]); glam_array!(glam::Vec4, [f32; 4]); -glam_array!(glam::Quat, [f32; 4]); glam_cols_array!(glam::Mat2, [f32; 4]); glam_cols_array!(glam::Mat3, [f32; 9]); // glam_cols_array!(Mat3A, [f32; 4]); @@ -51,7 +50,6 @@ glam_cols_array!(glam::Affine3A, [f32; 12]); glam_array!(glam::DVec2, [f64; 2]); glam_array!(glam::DVec3, [f64; 3]); glam_array!(glam::DVec4, [f64; 4]); -glam_array!(glam::DQuat, [f64; 4]); glam_cols_array!(glam::DMat2, [f64; 4]); glam_cols_array!(glam::DMat3, [f64; 9]); glam_cols_array!(glam::DMat4, [f64; 16]); diff --git a/node-graph/libraries/no-std-types/src/shaders/buffer_struct/primitive.rs b/node-graph/libraries/no-std-types/src/shaders/buffer_struct/primitive.rs index 84bc92d828..b11c5082b2 100644 --- a/node-graph/libraries/no-std-types/src/shaders/buffer_struct/primitive.rs +++ b/node-graph/libraries/no-std-types/src/shaders/buffer_struct/primitive.rs @@ -26,7 +26,6 @@ identity!(isize); identity!(f32); identity!(f64); -identity!(spirv_std::arch::SubgroupMask); identity!(spirv_std::memory::Semantics); identity!(spirv_std::ray_tracing::RayFlags); identity!(spirv_std::indirect_command::DrawIndirectCommand); diff --git a/node-graph/nodes/raster/shaders/Cargo.toml b/node-graph/nodes/raster/shaders/Cargo.toml index d9f22ddc9f..175f25468b 100644 --- a/node-graph/nodes/raster/shaders/Cargo.toml +++ b/node-graph/nodes/raster/shaders/Cargo.toml @@ -6,12 +6,9 @@ description = "graphene raster data format" authors = ["Graphite Authors "] license = "MIT OR Apache-2.0" -[lib] -crate-type = ["rlib", "dylib"] - [dependencies] [build-dependencies] -cargo-gpu = { workspace = true } +cargo-gpu-install = { workspace = true } env_logger = { workspace = true } log = { workspace = true } diff --git a/node-graph/nodes/raster/shaders/build.rs b/node-graph/nodes/raster/shaders/build.rs index 29901d2b7e..f80677a347 100644 --- a/node-graph/nodes/raster/shaders/build.rs +++ b/node-graph/nodes/raster/shaders/build.rs @@ -1,5 +1,5 @@ -use cargo_gpu::InstalledBackend; -use cargo_gpu::spirv_builder::{MetadataPrintout, SpirvMetadata}; +use cargo_gpu_install::install::{Install, InstalledBackend}; +use cargo_gpu_install::spirv_builder::SpirvMetadata; use std::path::PathBuf; pub fn main() -> Result<(), Box> { @@ -29,19 +29,18 @@ pub fn main() -> Result<(), Box> { let rustc_codegen_spirv_path = std::env::var("RUSTC_CODEGEN_SPIRV_PATH").unwrap_or_default(); let backend = if rustc_codegen_spirv_path.is_empty() { // install the toolchain and build the `rustc_codegen_spirv` codegen backend with it - cargo_gpu::Install::from_shader_crate(shader_crate.clone()).run()? + Install::from_shader_crate(shader_crate.clone()).run()? } else { // use the `RUSTC_CODEGEN_SPIRV` environment variable to find the codegen backend let mut backend = InstalledBackend::default(); backend.rustc_codegen_spirv_location = PathBuf::from(rustc_codegen_spirv_path); backend.toolchain_channel = "nightly".to_string(); - backend.target_spec_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")); backend }; // build the shader crate let mut builder = backend.to_spirv_builder(shader_crate, "spirv-unknown-naga-wgsl"); - builder.print_metadata = MetadataPrintout::DependencyOnly; + builder.build_script.defaults = true; builder.spirv_metadata = SpirvMetadata::Full; let wgsl_result = builder.build()?; let path_to_spv = wgsl_result.module.unwrap_single(); diff --git a/node-graph/nodes/raster/shaders/spirv-unknown-naga-wgsl.json b/node-graph/nodes/raster/shaders/spirv-unknown-naga-wgsl.json deleted file mode 100644 index 00f17162c0..0000000000 --- a/node-graph/nodes/raster/shaders/spirv-unknown-naga-wgsl.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "allows-weak-linkage": false, - "arch": "spirv", - "crt-objects-fallback": "false", - "crt-static-allows-dylibs": true, - "crt-static-respected": true, - "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64", - "dll-prefix": "", - "dll-suffix": ".spv.json", - "dynamic-linking": true, - "emit-debug-gdb-scripts": false, - "env": "naga-wgsl", - "linker-flavor": "unix", - "linker-is-gnu": false, - "llvm-target": "spirv-unknown-naga-wgsl", - "main-needs-argc-argv": false, - "metadata": { - "description": null, - "host_tools": null, - "std": null, - "tier": null - }, - "panic-strategy": "abort", - "simd-types-indirect": false, - "target-pointer-width": "32" -}