Skip to content

Commit

Permalink
Update references to piet-gpu where it makes sense (#240)
Browse files Browse the repository at this point in the history
  • Loading branch information
canadaduane authored Jan 8, 2023
1 parent 480e5a5 commit 3e8a481
Show file tree
Hide file tree
Showing 12 changed files with 9 additions and 13 deletions.
2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ members = ["examples/with_winit", "examples/with_bevy", "examples/run_wasm"]
[workspace.package]
edition = "2021"
version = "0.1.0"
authors = ["piet-gpu developers"]

[patch.crates-io]
# Required for metal support to work on wgpu
Expand All @@ -16,7 +15,6 @@ naga = { git = "https://github.com/gfx-rs/naga", rev = "ddcd5d3121150b2b1beee6e5
[package]
name = "vello"
version = "0.1.0"
authors = ["Raph Levien <[email protected]>"]
license = "MIT/Apache-2.0"
edition = "2021"

Expand Down
2 changes: 2 additions & 0 deletions doc/vision.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

Raph Levien, 2020-12-10

Note: `vello` was previously called `piet-gpu`.

I’ve done several [blog posts](./blogs.md) about piet-gpu already, and more generally GPU compute, but this document is a little different in scope. Rather than showing off a prototype and presenting a research result, it will set forth a bold and ambitious plan for where this might go. I find this vision compelling, and it’s motivated me to spend a lot of energy mastering some difficult material. The grand vision is much more than one person can do, so I’ll do some of it myself and maybe inspire collaboration for the rest of it.

The full vision for piet-gpu is a 2D rendering engine that is considerably faster, higher quality, and more flexible than the current state of the art, and runs on a wide variety of hardware. I’ll go into some detail about why I think this goal is possible and what kind of work is needed to get there.
Expand Down
1 change: 0 additions & 1 deletion examples/run_wasm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[package]
name = "run-wasm"
version.workspace = true
authors.workspace = true
edition.workspace = true
publish = false

Expand Down
1 change: 0 additions & 1 deletion examples/with_winit/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[package]
name = "with_winit"
version.workspace = true
authors.workspace = true
edition.workspace = true
publish = false

Expand Down
2 changes: 1 addition & 1 deletion examples/with_winit/src/simple_text.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2022 The piet-gpu authors.
// 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.
Expand Down
2 changes: 1 addition & 1 deletion examples/with_winit/src/test_scene.rs
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ pub fn render_anim_frame(sb: &mut SceneBuilder, text: &mut SimpleText, i: usize)
&rect,
);
let text_size = 60.0 + 40.0 * (0.01 * i as f32).sin();
let s = "\u{1f600}hello piet-gpu text!";
let s = "\u{1f600}hello vello text!";
text.add(
sb,
None,
Expand Down
2 changes: 1 addition & 1 deletion shader/fine.wgsl
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ fn main(
let rad = read_rad_grad(cmd_ix);
for (var i = 0u; i < PIXELS_PER_THREAD; i += 1u) {
let my_xy = vec2(xy.x + f32(i), xy.y);
// TODO: can hoist y, but for now stick to piet-gpu
// TODO: can hoist y, but for now stick to the GLSL version
let xy_xformed = rad.matrx.xz * my_xy.x + rad.matrx.yw * my_xy.y - rad.xlat;
let ba = dot(xy_xformed, rad.c1);
let ca = rad.ra * dot(xy_xformed, xy_xformed);
Expand Down
1 change: 0 additions & 1 deletion shader/shared/config.wgsl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ struct Config {
bin_data_start: u32,

// offsets within scene buffer (in u32 units)
// Note: this is a difference from piet-gpu, which is in bytes
pathtag_base: u32,
pathdata_base: u32,

Expand Down
3 changes: 1 addition & 2 deletions shader/tile_alloc.wgsl
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ fn main(
// process fewer draw objects than the number of threads in the wg.
let total_count = sh_tile_count[WG_SIZE - 1u];
for (var i = local_id.x; i < total_count; i += WG_SIZE) {
// Note: could format output buffer as u32 for even better load
// balancing, as does piet-gpu.
// Note: could format output buffer as u32 for even better load balancing.
tiles[tile_offset + i] = Tile(0, 0u);
}
}
2 changes: 1 addition & 1 deletion src/engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ pub enum Command {
UploadImage(ImageProxy, Vec<u8>),
// Discussion question: third argument is vec of resources?
// Maybe use tricks to make more ergonomic?
// Alternative: provide bufs & images as separate sequences, like piet-gpu.
// Alternative: provide bufs & images as separate sequences
Dispatch(ShaderId, (u32, u32, u32), Vec<ResourceProxy>),
Download(BufProxy),
Clear(BufProxy, u64, Option<NonZeroU64>),
Expand Down
2 changes: 1 addition & 1 deletion src/glyph.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2022 The piet-gpu authors.
// 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.
Expand Down
2 changes: 1 addition & 1 deletion src/scene.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2022 The piet-gpu authors.
// 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.
Expand Down

0 comments on commit 3e8a481

Please sign in to comment.