Raster Spike

.github/workflows/build.yml

@@ -56,7 +56,7 @@ jobs:
       CARGO_TERM_COLOR: always
       RUSTC_WRAPPER: /usr/bin/sccache
       CARGO_INCREMENTAL: 0
-      # sccache deletes the oldest files in its folder once past its size cap, so it gets a folder apart from rust-gpu's codegen backend and Binaryen
+      # sccache deletes the oldest files in its folder once past its size cap, so it gets a folder apart from Binaryen
       SCCACHE_DIR: /var/lib/github-actions/.cache/sccache
       # NOTICE: keep these tool versions in sync with the other jobs in this file, `.devcontainer/devcontainer.json`, `.nix/dev.nix` and `.nix/pkgs/graphite.nix` (wasm-bindgen-cli), `tools/cargo-run/src/requirements.rs` (wasm-bindgen-cli, cargo-about), `tools/cargo-run/src/requirements/wasm_opt.rs` (Binaryen), and the `wasm-bindgen` crate in `Cargo.toml`
       WASM_BINDGEN_CLI_VERSION: "0.2.127"

.github/workflows/check.yml

@@ -135,7 +135,7 @@ jobs:
     env:
       RUSTC_WRAPPER: /usr/bin/sccache
       CARGO_INCREMENTAL: 0
-      # sccache deletes the oldest files in its folder once past its size cap, so it gets a folder apart from rust-gpu's codegen backend
+      # sccache deletes the oldest files in its folder once past its size cap, so it gets a folder of its own
       SCCACHE_DIR: /var/lib/github-actions/.cache/sccache
     steps:
       - name: 📥 Clone repository

.nix/default.nix

@@ -31,7 +31,6 @@ let
 
         deps = {
           crane = lib.call ./deps/crane.nix;
-          rustGPU = lib.call ./deps/rust-gpu.nix;
           cargoAbout = lib.call ./deps/cargo-about.nix;
         };
 
@@ -57,7 +56,6 @@ in
       default = graphite;
       graphite = (lib.call ./pkgs/graphite.nix) { };
       graphite-dev = (lib.call ./pkgs/graphite.nix) { dev = true; };
-      graphite-raster-nodes-shaders = lib.call ./pkgs/graphite-raster-nodes-shaders.nix;
       graphite-branding = lib.call ./pkgs/graphite-branding.nix;
       graphite-bundle = (lib.call ./pkgs/graphite-bundle.nix) { };
       graphite-bundle-dev = (lib.call ./pkgs/graphite-bundle.nix) { graphite = graphite-dev; };

.nix/dev.nix

@@ -48,7 +48,6 @@ let
         pkgs.graphviz
       ];
     }
-    deps.rustGPU
     (lib.optionalAttrs desktop (
       {
         libs = [

.nix/pkgs/graphite.nix

@@ -35,7 +35,6 @@ let
         inherit (deps.crane.lib.findCargoFiles (deps.crane.lib.cleanCargoSource info.src)) cargoConfigs;
         cargoLockList = [
           "${info.src}/Cargo.lock"
-          "${deps.rustGPU.toolchain.availableComponents.rust-src}/lib/rustlib/src/rust/library/Cargo.lock"
         ];
       }
     );
@@ -97,7 +96,6 @@ deps.crane.lib.buildPackage (
     makeCacheWritable = true;
 
     env = {
-      RASTER_NODES_SHADER_PATH = self.packages.${system}.graphite-raster-nodes-shaders;
       GRAPHITE_GIT_COMMIT_HASH = self.rev or "unknown";
       GRAPHITE_GIT_COMMIT_DATE = self.lastModified or "unknown";
       CEF_PATH = "${self.packages.${system}.graphite-cef}/lib";