address review comments
diff --git a/.github/copyright.sh b/.github/copyright.sh index 7ffc546..b090c08 100755 --- a/.github/copyright.sh +++ b/.github/copyright.sh
@@ -7,7 +7,7 @@ # -g "!src/special_directory" # Check all the standard Rust source files -output=$(rg "^// Copyright (19|20)[\d]{2} (.+ and )?the Vello Authors( and .+)?$\n^// SPDX-License-Identifier: Apache-2\.0 OR MIT$\n\n" --files-without-match --multiline -g "*.rs" -g "!{shader,src/cpu_shader}" .) +output=$(rg "^// Copyright (19|20)[\d]{2} (.+ and )?the Vello Authors( and .+)?$\n^// SPDX-License-Identifier: Apache-2\.0 OR MIT$\n\n" --files-without-match --multiline -g "*.rs" -g "!{shader,crates/shaders/src/cpu}" .) if [ -n "$output" ]; then echo -e "The following files lack the correct copyright header:\n" @@ -20,7 +20,7 @@ fi # Check all the shaders, both WGSL and CPU shaders in Rust, as they also have Unlicense -output=$(rg "^// Copyright (19|20)[\d]{2} (.+ and )?the Vello Authors( and .+)?$\n^// SPDX-License-Identifier: Apache-2\.0 OR MIT OR Unlicense$\n\n" --files-without-match --multiline -g "{shader,src/cpu_shader}/**/*.{rs,wgsl}" .) +output=$(rg "^// Copyright (19|20)[\d]{2} (.+ and )?the Vello Authors( and .+)?$\n^// SPDX-License-Identifier: Apache-2\.0 OR MIT OR Unlicense$\n\n" --files-without-match --multiline -g "{shader,crates/shaders/src/cpu}/**/*.{rs,wgsl}" .) if [ -n "$output" ]; then echo -e "The following shader files lack the correct copyright header:\n"
diff --git a/Cargo.toml b/Cargo.toml index 2e40542..d40cb2c 100644 --- a/Cargo.toml +++ b/Cargo.toml
@@ -47,7 +47,7 @@ # bump-allocated GPU memory. # TODO: Turn this into a runtime option used at resolve time and remove the feature. bump_estimate = ["vello_encoding/bump_estimate"] -hot_reload = [] +hot_reload = ["vello_shaders/compile"] buffer_labels = [] [lints]
diff --git a/crates/shaders/Cargo.toml b/crates/shaders/Cargo.toml index e9276f2..cc469cd 100644 --- a/crates/shaders/Cargo.toml +++ b/crates/shaders/Cargo.toml
@@ -10,7 +10,7 @@ publish = false # Remove this when the package is ready for publishing [features] -default = ["compile", "wgsl", "full", "cpu"] +default = ["wgsl", "full", "cpu"] compile = ["naga", "thiserror"] # Enables the complete imaging model. When this feature is disabled, the fine rasterization
diff --git a/src/shaders.rs b/src/shaders.rs index 0919909..e42ff88 100644 --- a/src/shaders.rs +++ b/src/shaders.rs
@@ -102,9 +102,6 @@ CpuShaderType::Present(vello_shaders::cpu::$name) ) }; - ($name:ident, $bindings:expr) => { - add_shader!($name, $bindings) - }; } let pathtag_reduce = add_shader!(pathtag_reduce, [Uniform, BufReadOnly, Buffer]);