Skip to content

Change path_data's type to store values as f32 #819

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

Change path_data's type to store values as f32 #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f600f75
Change path_data's type to store values as f32
PoignardAzur Feb 20, 2025
44dcef6
Fix clippy lints
PoignardAzur Feb 20, 2025
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
12 changes: 11 additions & 1 deletion vello_encoding/src/encoding.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub struct Encoding {
/// The path tag stream.
pub path_tags: Vec<PathTag>,
/// The path data stream.
pub path_data: Vec<u8>,
pub path_data: Vec<f32>,
/// The draw tag stream.
pub draw_tags: Vec<DrawTag>,
/// The draw data stream.
Expand Down Expand Up @@ -510,6 +510,16 @@ impl Encoding {
}
}
}

/// Return false if the path has any NaN values.
pub fn validate_path_data(&self) -> bool {
for value in &self.path_data {
if value.is_nan() {
return false;
}
}
true
}
}

/// Result for adding a sequence of color stops.
Expand Down
55 changes: 22 additions & 33 deletions vello_encoding/src/path.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ pub struct Tile {
/// Encoder for path segments.
pub struct PathEncoder<'a> {
tags: &'a mut Vec<PathTag>,
data: &'a mut Vec<u8>,
path_data: &'a mut Vec<f32>,
n_segments: &'a mut u32,
n_paths: &'a mut u32,
first_point: [f32; 2],
Expand Down Expand Up @@ -474,14 +474,14 @@ impl<'a> PathEncoder<'a> {
/// line-to), the thread draws nothing.
pub fn new(
tags: &'a mut Vec<PathTag>,
data: &'a mut Vec<u8>,
data: &'a mut Vec<f32>,
n_segments: &'a mut u32,
n_paths: &'a mut u32,
is_fill: bool,
) -> Self {
Self {
tags,
data,
path_data: data,
n_segments,
n_paths,
first_point: [0.0, 0.0],
Expand All @@ -498,10 +498,9 @@ impl<'a> PathEncoder<'a> {
self.close();
}
let buf = [x, y];
let bytes = bytemuck::bytes_of(&buf);
if self.state == PathState::MoveTo {
let new_len = self.data.len() - 8;
self.data.truncate(new_len);
let new_len = self.path_data.len() - 2;
self.path_data.truncate(new_len);
} else if self.state == PathState::NonemptySubpath {
if !self.is_fill {
self.insert_stroke_cap_marker_segment(false);
Expand All @@ -511,7 +510,7 @@ impl<'a> PathEncoder<'a> {
}
}
self.first_point = buf;
self.data.extend_from_slice(bytes);
self.path_data.extend_from_slice(&buf);
self.state = PathState::MoveTo;
}

Expand All @@ -538,8 +537,7 @@ impl<'a> PathEncoder<'a> {
return;
}
let buf = [x, y];
let bytes = bytemuck::bytes_of(&buf);
self.data.extend_from_slice(bytes);
self.path_data.extend_from_slice(&buf);
self.tags.push(PathTag::LINE_TO_F32);
self.state = PathState::NonemptySubpath;
self.n_encoded_segments += 1;
Expand All @@ -566,8 +564,7 @@ impl<'a> PathEncoder<'a> {
return;
}
let buf = [x1, y1, x2, y2];
let bytes = bytemuck::bytes_of(&buf);
self.data.extend_from_slice(bytes);
self.path_data.extend_from_slice(&buf);
self.tags.push(PathTag::QUAD_TO_F32);
self.state = PathState::NonemptySubpath;
self.n_encoded_segments += 1;
Expand All @@ -594,18 +591,16 @@ impl<'a> PathEncoder<'a> {
return;
}
let buf = [x1, y1, x2, y2, x3, y3];
let bytes = bytemuck::bytes_of(&buf);
self.data.extend_from_slice(bytes);
self.path_data.extend_from_slice(&buf);
self.tags.push(PathTag::CUBIC_TO_F32);
self.state = PathState::NonemptySubpath;
self.n_encoded_segments += 1;
}

/// Encodes an empty path (as placeholder for begin clip).
pub(crate) fn empty_path(&mut self) {
let coords = [0.0_f32, 0., 0., 0.];
let bytes = bytemuck::bytes_of(&coords);
self.data.extend_from_slice(bytes);
let buf = [0., 0., 0., 0.];
self.path_data.extend_from_slice(&buf);
self.tags.push(PathTag::LINE_TO_F32);
self.n_encoded_segments += 1;
}
Expand All @@ -615,21 +610,20 @@ impl<'a> PathEncoder<'a> {
match self.state {
PathState::Start => return,
PathState::MoveTo => {
let new_len = self.data.len() - 8;
self.data.truncate(new_len);
let new_len = self.path_data.len() - 2;
self.path_data.truncate(new_len);
self.state = PathState::Start;
return;
}
PathState::NonemptySubpath => (),
}
let len = self.data.len();
if len < 8 {
let len = self.path_data.len();
if len < 2 {
// can't happen
return;
}
let first_bytes = bytemuck::bytes_of(&self.first_point);
if &self.data[len - 8..len] != first_bytes {
self.data.extend_from_slice(first_bytes);
if self.path_data[len - 2..len] != self.first_point {
self.path_data.extend_from_slice(&self.first_point);
self.tags.push(PathTag::LINE_TO_F32);
self.n_encoded_segments += 1;
}
Expand Down Expand Up @@ -680,8 +674,8 @@ impl<'a> PathEncoder<'a> {
self.close();
}
if self.state == PathState::MoveTo {
let new_len = self.data.len() - 8;
self.data.truncate(new_len);
let new_len = self.path_data.len() - 2;
self.path_data.truncate(new_len);
}
if self.n_encoded_segments != 0 {
if !self.is_fill && self.state == PathState::NonemptySubpath {
Expand Down Expand Up @@ -721,14 +715,9 @@ impl<'a> PathEncoder<'a> {
}

fn last_point(&self) -> Option<(f32, f32)> {
let len = self.data.len();
if len < 8 {
return None;
}
Some((
bytemuck::pod_read_unaligned::<f32>(&self.data[len - 8..len - 4]),
bytemuck::pod_read_unaligned::<f32>(&self.data[len - 4..len]),
))
let len = self.path_data.len();
let last_two = &self.path_data.get(len - 2..)?;
Some((last_two[0], last_two[1]))
}

fn is_zero_length_segment(
Expand Down
Loading