Standardize copyright headers.

README.md

@@ -206,8 +206,9 @@ Licensed under either of
 
 at your option.
 
-In addition, all files in the [`shader`](shader) directory and subdirectories thereof are alternatively
-licensed under the Unlicense ([shader/UNLICENSE](shader/UNLICENSE) or <http://unlicense.org/>).
+In addition, all files in the [`shader`](shader) and [`src/cpu_shader`](src/cpu_shader)
+directories and subdirectories thereof are alternatively licensed under
+the Unlicense ([shader/UNLICENSE](shader/UNLICENSE) or <http://unlicense.org/>).
 For clarity, these files are also licensed under either of the above licenses.
 The intent is for this research to be used in as broad a context as possible.
 

crates/encoding/src/binning.rs

@@ -1,4 +1,4 @@
-// Copyright 2023 The Vello authors
+// Copyright 2023 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use bytemuck::{Pod, Zeroable};

crates/encoding/src/clip.rs

@@ -1,4 +1,4 @@
-// Copyright 2023 The Vello authors
+// Copyright 2023 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use bytemuck::{Pod, Zeroable};

crates/encoding/src/config.rs

@@ -1,4 +1,4 @@
-// Copyright 2023 The Vello authors
+// Copyright 2023 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use crate::SegmentCount;

crates/encoding/src/draw.rs

@@ -1,4 +1,4 @@
-// Copyright 2022 The Vello authors
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use bytemuck::{Pod, Zeroable};

crates/encoding/src/encoding.rs

@@ -1,4 +1,4 @@
-// Copyright 2022 The Vello authors
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use super::{DrawColor, DrawTag, PathEncoder, PathTag, Style, Transform};

crates/encoding/src/glyph.rs

@@ -1,4 +1,4 @@
-// Copyright 2023 The Vello authors
+// Copyright 2023 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use std::ops::Range;

crates/encoding/src/glyph_cache.rs

@@ -1,4 +1,4 @@
-// Copyright 2022 The Vello authors
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use std::collections::HashMap;

crates/encoding/src/image_cache.rs

@@ -1,4 +1,4 @@
-// Copyright 2022 The Vello authors
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use guillotiere::{size2, AtlasAllocator};

crates/encoding/src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2023 The Vello authors
+// Copyright 2023 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! Raw scene encoding.

crates/encoding/src/mask.rs

@@ -1,4 +1,4 @@
-// Copyright 2022 The Vello authors
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! Create a lookup table of half-plane sample masks.

crates/encoding/src/math.rs

@@ -1,4 +1,4 @@
-// Copyright 2022 The Vello authors
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use std::ops::Mul;

crates/encoding/src/monoid.rs

@@ -1,4 +1,4 @@
-// Copyright 2022 The Vello authors
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 /// Interface for a monoid. The default value must be the identity of

crates/encoding/src/path.rs

@@ -1,4 +1,4 @@
-// Copyright 2022 The Vello authors
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use bytemuck::{Pod, Zeroable};

crates/encoding/src/ramp_cache.rs

@@ -1,4 +1,4 @@
-// Copyright 2022 The Vello authors
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use std::collections::HashMap;

crates/encoding/src/resolve.rs

@@ -1,4 +1,4 @@
-// Copyright 2022 The Vello authors
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use bytemuck::{Pod, Zeroable};

crates/shaders/build.rs

@@ -1,4 +1,4 @@
-// Copyright 2023 The Vello authors
+// Copyright 2023 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 #[path = "src/compile/mod.rs"]

crates/shaders/src/compile/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2023 The Vello authors
+// Copyright 2023 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use {

crates/shaders/src/compile/msl.rs

@@ -1,4 +1,4 @@
-// Copyright 2023 The Vello authors
+// Copyright 2023 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use naga::back::msl as naga_msl;

crates/shaders/src/compile/permutations.rs

@@ -1,4 +1,4 @@
-// Copyright 2023 The Vello authors
+// Copyright 2023 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use std::collections::HashMap;

crates/shaders/src/compile/preprocess.rs

@@ -1,4 +1,4 @@
-// Copyright 2023 The Vello authors
+// Copyright 2023 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use std::{

crates/shaders/src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2023 The Vello authors
+// Copyright 2023 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 #![warn(clippy::doc_markdown, clippy::semicolon_if_nothing_returned)]

crates/shaders/src/types.rs

@@ -1,4 +1,4 @@
-// Copyright 2023 The Vello authors
+// Copyright 2023 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! Types that are shared between the main crate and build.

crates/tests/build.rs

@@ -1,3 +1,6 @@
+// Copyright 2024 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::env;
 
 fn main() {

crates/tests/src/lib.rs

@@ -1,3 +1,6 @@
+// Copyright 2024 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::{env, fs::File, num::NonZeroUsize, path::Path, sync::Arc};
 
 use anyhow::{anyhow, bail, Result};

crates/tests/tests/smoke.rs

@@ -1,3 +1,6 @@
+// Copyright 2024 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use vello::{
     kurbo::{Affine, Rect},
     peniko::{Brush, Color, Format},

examples/headless/src/main.rs

@@ -1,3 +1,6 @@
+// Copyright 2023 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::{
     fs::File,
     num::NonZeroUsize,

examples/run_wasm/src/main.rs

@@ -1,3 +1,6 @@
+// Copyright 2022 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 /// Use [cargo-run-wasm](https://github.com/rukai/cargo-run-wasm) to build an example for web
 ///
 /// Usage:

examples/scenes/src/download.rs

@@ -1,3 +1,6 @@
+// Copyright 2022 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::{
     io::Seek,
     path::{Path, PathBuf},

examples/scenes/src/download/default_downloads.rs

@@ -1,3 +1,6 @@
+// Copyright 2022 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 // This content cannot be formatted by rustfmt because of the long strings, so it's in its own file
 use super::{BuiltinSvgProps, SVGDownload};
 

examples/scenes/src/images.rs

@@ -1,3 +1,6 @@
+// Copyright 2023 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;

examples/scenes/src/lib.rs

@@ -1,3 +1,6 @@
+// Copyright 2022 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 #[cfg(not(target_arch = "wasm32"))]
 pub mod download;
 mod images;

examples/scenes/src/mmark.rs

@@ -1,3 +1,6 @@
+// Copyright 2023 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 //! A benchmark based on MotionMark 1.2's path benchmark.
 //! This is roughly comparable to:
 //!

examples/scenes/src/simple_text.rs

@@ -1,18 +1,5 @@
-// Copyright 2022 The vello authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Also licensed under MIT license, at your choice.
+// Copyright 2022 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use std::sync::Arc;
 

examples/scenes/src/svg.rs

@@ -1,3 +1,6 @@
+// Copyright 2022 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::{
     fs::read_dir,
     path::{Path, PathBuf},

examples/scenes/src/test_scenes.rs

@@ -1,4 +1,4 @@
-// Copyright 2022 The Vello authors
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use crate::{ExampleScene, SceneConfig, SceneParams, SceneSet};

examples/with_bevy/src/main.rs

@@ -1,3 +1,6 @@
+// Copyright 2022 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::num::NonZeroUsize;
 
 use bevy::render::{Render, RenderSet};

examples/with_winit/src/hot_reload.rs

@@ -1,3 +1,6 @@
+// Copyright 2023 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use std::{path::Path, time::Duration};
 
 use anyhow::Result;

examples/with_winit/src/lib.rs

@@ -1,18 +1,5 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Also licensed under MIT license, at your choice.
+// Copyright 2022 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use instant::{Duration, Instant};
 use std::num::NonZeroUsize;

examples/with_winit/src/main.rs

@@ -1,3 +1,6 @@
+// Copyright 2022 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use anyhow::Result;
 
 fn main() -> Result<()> {

examples/with_winit/src/multi_touch.rs

@@ -1,3 +1,6 @@
+// Copyright 2023 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 /// Adapted from https://github.com/emilk/egui/blob/212656f3fc6b931b21eaad401e5cec2b0da93baa/crates/egui/src/input_state/touch_state.rs
 use std::{collections::BTreeMap, fmt::Debug};
 

examples/with_winit/src/stats.rs

@@ -1,18 +1,5 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Also licensed under MIT license, at your choice.
+// Copyright 2023 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use scenes::SimpleText;
 use std::{collections::VecDeque, time::Duration};

integrations/vello_svg/src/lib.rs

@@ -1,3 +1,6 @@
+// Copyright 2023 the Vello Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 //! Append a [`usvg::Tree`] to a Vello [`Scene`]
 //!
 //! This currently lacks support for a [number of important](crate#unsupported-features) SVG features.

shader/backdrop.wgsl

@@ -1,3 +1,4 @@
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense
 
 // Note: this is the non-atomic version

shader/backdrop_dyn.wgsl

@@ -1,3 +1,4 @@
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense
 
 // Prefix sum for dynamically allocated backdrops

shader/bbox_clear.wgsl

@@ -1,3 +1,4 @@
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense
 
 #import config

shader/binning.wgsl

@@ -1,3 +1,4 @@
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense
 
 // The binning stage

shader/clip_leaf.wgsl

@@ -1,3 +1,4 @@
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense
 
 #import config

shader/clip_reduce.wgsl

@@ -1,3 +1,4 @@
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense
 
 #import bbox

shader/coarse.wgsl

@@ -1,3 +1,4 @@
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense
 
 // The coarse rasterization stage.

shader/draw_leaf.wgsl

@@ -1,3 +1,4 @@
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense
 
 // Finish prefix sum of drawtags, decode draw objects.

shader/draw_reduce.wgsl

@@ -1,3 +1,4 @@
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense
 
 #import config

shader/fine.wgsl

@@ -1,3 +1,4 @@
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense
 
 // Fine rasterizer. This can run in simple (just path rendering) and full

shader/flatten.wgsl

@@ -1,3 +1,4 @@
+// Copyright 2022 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense
 
 // Flatten curves to lines

shader/path_count.wgsl

@@ -1,3 +1,4 @@
+// Copyright 2023 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense
 
 // Stage to compute counts of number of segments in each tile

shader/path_count_setup.wgsl

@@ -1,3 +1,4 @@
+// Copyright 2023 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense
 
 // Set up dispatch size for path count stage.

shader/path_tiling.wgsl

@@ -1,3 +1,4 @@
+// Copyright 2023 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense
 
 // Write path segments

shader/path_tiling_setup.wgsl

@@ -1,3 +1,4 @@
+// Copyright 2023 the Vello Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense
 
 // Set up dispatch size for path tiling stage.