diff --git a/Cargo.toml b/Cargo.toml index e682fe3..5873f00 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,8 @@ resolver = "2" members = [ + "crates/shaders", + "integrations/vello_svg", "examples/headless", @@ -9,7 +11,6 @@ members = [ "examples/with_bevy", "examples/run_wasm", "examples/scenes", - "vello_shaders", ] [workspace.package] diff --git a/vello_shaders/Cargo.toml b/crates/shaders/Cargo.toml similarity index 100% rename from vello_shaders/Cargo.toml rename to crates/shaders/Cargo.toml diff --git a/vello_shaders/README.md b/crates/shaders/README.md similarity index 100% rename from vello_shaders/README.md rename to crates/shaders/README.md diff --git a/vello_shaders/build.rs b/crates/shaders/build.rs similarity index 98% rename from vello_shaders/build.rs rename to crates/shaders/build.rs index 0856974..7e5a952 100644 --- a/vello_shaders/build.rs +++ b/crates/shaders/build.rs @@ -15,7 +15,7 @@ use compile::ShaderInfo; fn main() { let out_dir = env::var_os("OUT_DIR").unwrap(); let dest_path = Path::new(&out_dir).join("shaders.rs"); - let mut shaders = compile::ShaderInfo::from_dir("../shader"); + let mut shaders = compile::ShaderInfo::from_dir("../../shader"); // Drop the HashMap and sort by name so that we get deterministic order. let mut shaders = shaders.drain().collect::>(); shaders.sort_by(|x, y| x.0.cmp(&y.0)); diff --git a/vello_shaders/src/compile/mod.rs b/crates/shaders/src/compile/mod.rs similarity index 100% rename from vello_shaders/src/compile/mod.rs rename to crates/shaders/src/compile/mod.rs diff --git a/vello_shaders/src/compile/msl.rs b/crates/shaders/src/compile/msl.rs similarity index 100% rename from vello_shaders/src/compile/msl.rs rename to crates/shaders/src/compile/msl.rs diff --git a/vello_shaders/src/compile/permutations.rs b/crates/shaders/src/compile/permutations.rs similarity index 100% rename from vello_shaders/src/compile/permutations.rs rename to crates/shaders/src/compile/permutations.rs diff --git a/vello_shaders/src/compile/preprocess.rs b/crates/shaders/src/compile/preprocess.rs similarity index 100% rename from vello_shaders/src/compile/preprocess.rs rename to crates/shaders/src/compile/preprocess.rs diff --git a/vello_shaders/src/lib.rs b/crates/shaders/src/lib.rs similarity index 100% rename from vello_shaders/src/lib.rs rename to crates/shaders/src/lib.rs diff --git a/vello_shaders/src/types.rs b/crates/shaders/src/types.rs similarity index 100% rename from vello_shaders/src/types.rs rename to crates/shaders/src/types.rs