Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standardize copyright headers. #456

Merged
merged 2 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# This is the list of Vello's significant contributors.
#
# This does not necessarily list everyone who has contributed code,
# especially since many employees of one corporation may be contributing.
# To see the full list of contributors, see the revision history in
# source control.
Google LLC
Raph Levien
Chad Brokaw
Arman Uguray
Elias Naur
Daniel McNab
Spencer C. Imbleau
Bruce Mitchener
Tatsuyuki Ishi
Markus Siglreithmaier
Rose Hudson
Brian Merchant
Matt Rice
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion crates/encoding/src/binning.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion crates/encoding/src/clip.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion crates/encoding/src/config.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/encoding/src/draw.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion crates/encoding/src/encoding.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion crates/encoding/src/glyph.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/encoding/src/glyph_cache.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/encoding/src/image_cache.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion crates/encoding/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion crates/encoding/src/mask.rs
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion crates/encoding/src/math.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/encoding/src/monoid.rs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion crates/encoding/src/path.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion crates/encoding/src/ramp_cache.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/encoding/src/resolve.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion crates/shaders/build.rs
Original file line number Diff line number Diff line change
@@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion crates/shaders/src/compile/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 The Vello authors
// Copyright 2023 the Vello Authors
// SPDX-License-Identifier: Apache-2.0 OR MIT

use {
Expand Down
2 changes: 1 addition & 1 deletion crates/shaders/src/compile/msl.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/shaders/src/compile/permutations.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/shaders/src/compile/preprocess.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 The Vello authors
// Copyright 2023 the Vello Authors
// SPDX-License-Identifier: Apache-2.0 OR MIT

use std::{
Expand Down
2 changes: 1 addition & 1 deletion crates/shaders/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion crates/shaders/src/types.rs
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 3 additions & 0 deletions crates/tests/build.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright 2024 the Vello Authors
// SPDX-License-Identifier: Apache-2.0 OR MIT

use std::env;

fn main() {
Expand Down
3 changes: 3 additions & 0 deletions crates/tests/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
3 changes: 3 additions & 0 deletions crates/tests/tests/smoke.rs
Original file line number Diff line number Diff line change
@@ -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},
Expand Down
3 changes: 3 additions & 0 deletions examples/headless/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright 2023 the Vello Authors
// SPDX-License-Identifier: Apache-2.0 OR MIT

use std::{
fs::File,
num::NonZeroUsize,
Expand Down
3 changes: 3 additions & 0 deletions examples/run_wasm/src/main.rs
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
3 changes: 3 additions & 0 deletions examples/scenes/src/download.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright 2022 the Vello Authors
// SPDX-License-Identifier: Apache-2.0 OR MIT

use std::{
io::Seek,
path::{Path, PathBuf},
Expand Down
3 changes: 3 additions & 0 deletions examples/scenes/src/download/default_downloads.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand Down
3 changes: 3 additions & 0 deletions examples/scenes/src/images.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
3 changes: 3 additions & 0 deletions examples/scenes/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
3 changes: 3 additions & 0 deletions examples/scenes/src/mmark.rs
Original file line number Diff line number Diff line change
@@ -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:
//!
Expand Down
17 changes: 2 additions & 15 deletions examples/scenes/src/simple_text.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
3 changes: 3 additions & 0 deletions examples/scenes/src/svg.rs
Original file line number Diff line number Diff line change
@@ -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},
Expand Down
2 changes: 1 addition & 1 deletion examples/scenes/src/test_scenes.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
3 changes: 3 additions & 0 deletions examples/with_bevy/src/main.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
3 changes: 3 additions & 0 deletions examples/with_winit/src/hot_reload.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
17 changes: 2 additions & 15 deletions examples/with_winit/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
3 changes: 3 additions & 0 deletions examples/with_winit/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright 2022 the Vello Authors
// SPDX-License-Identifier: Apache-2.0 OR MIT

use anyhow::Result;

fn main() -> Result<()> {
Expand Down
3 changes: 3 additions & 0 deletions examples/with_winit/src/multi_touch.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright 2023 the Vello Authors
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure this is right. It's mostly the work of the egui authors

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! I've created #464 to address this.

// 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};

Expand Down
17 changes: 2 additions & 15 deletions examples/with_winit/src/stats.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
3 changes: 3 additions & 0 deletions integrations/vello_svg/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 1 addition & 0 deletions shader/backdrop.wgsl
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions shader/backdrop_dyn.wgsl
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions shader/bbox_clear.wgsl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Copyright 2022 the Vello Authors
// SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense

#import config
Expand Down
1 change: 1 addition & 0 deletions shader/binning.wgsl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Copyright 2022 the Vello Authors
// SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense

// The binning stage
Expand Down
1 change: 1 addition & 0 deletions shader/clip_leaf.wgsl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Copyright 2022 the Vello Authors
// SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense

#import config
Expand Down
1 change: 1 addition & 0 deletions shader/clip_reduce.wgsl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Copyright 2022 the Vello Authors
// SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense

#import bbox
Expand Down
1 change: 1 addition & 0 deletions shader/coarse.wgsl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Copyright 2022 the Vello Authors
// SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense

// The coarse rasterization stage.
Expand Down
1 change: 1 addition & 0 deletions shader/draw_leaf.wgsl
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 1 addition & 0 deletions shader/draw_reduce.wgsl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Copyright 2022 the Vello Authors
// SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense

#import config
Expand Down
1 change: 1 addition & 0 deletions shader/fine.wgsl
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions shader/flatten.wgsl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Copyright 2022 the Vello Authors
// SPDX-License-Identifier: Apache-2.0 OR MIT OR Unlicense

// Flatten curves to lines
Expand Down
Loading