mirror of
https://github.com/storytold/photocraft.git
synced 2026-11-21 09:26:43 +00:00
Merge PR #7930: perf(liquify): parallel dab nodes and source read, P30 −13–15 %, same pixels
This commit is contained in:
commit
e1fde5bfa2
1 file changed
+32
-17
+32
-17
@@ -19,6 +19,7 @@
|
||||
//! copied untouched. [`ProxyImage::render`] is the cheap preview path: bilinear field and
|
||||
//! bilinear source on a downsampled RGBA copy, re-rendered only where a dab changed things.
|
||||
|
||||
use crate::par;
|
||||
use photocraft_geom::Rect;
|
||||
use photocraft_raster::Surface;
|
||||
use serde::{Deserialize, Serialize};
|
||||
@@ -186,6 +187,10 @@ struct StrokeCursor {
|
||||
carry: f64,
|
||||
}
|
||||
|
||||
/// Dabs over this many field nodes compute their rows in parallel (an 800 px brush has about
|
||||
/// 125,000); smaller ones are not worth the hand-off.
|
||||
const PARALLEL_DAB_NODES: usize = 16_384;
|
||||
|
||||
/// Distance between dabs along a stroke for brush radius `r`: a twentieth of the radius, so a
|
||||
/// drag is many small pushes and its edge stays smooth.
|
||||
fn dab_spacing(r: f64) -> f64 {
|
||||
@@ -487,9 +492,11 @@ impl LiquifyField {
|
||||
bilinear(&self.d, self.w, self.h, gx, gy)
|
||||
}
|
||||
};
|
||||
let mut writes: Vec<(usize, [f32; 2], f32)> = Vec::with_capacity((i1 - i0 + 1) * (j1 - j0 + 1));
|
||||
// Every node reads only the snapshot and the field as it was before this dab (the writes
|
||||
// land after), so rows are independent: a large brush computes them in parallel.
|
||||
let inv_cell = 1.0 / self.cell;
|
||||
for j in j0..=j1 {
|
||||
let node_row = |j: usize| -> Vec<(usize, [f32; 2], f32)> {
|
||||
let mut row = Vec::with_capacity(i1 - i0 + 1);
|
||||
for i in i0..=i1 {
|
||||
let p = self.node_pos(i, j);
|
||||
let (dx, dy) = (p[0] - c[0], p[1] - c[1]);
|
||||
@@ -503,7 +510,7 @@ impl LiquifyField {
|
||||
if s.tool == LiquifyTool::Freeze || s.tool == LiquifyTool::Thaw {
|
||||
let f = self.freeze[idx];
|
||||
let v = if s.tool == LiquifyTool::Freeze { (f as f64 + k_raw).min(1.0) } else { (f as f64 - k_raw).max(0.0) };
|
||||
writes.push((idx, self.d[idx], v as f32));
|
||||
row.push((idx, self.d[idx], v as f32));
|
||||
continue;
|
||||
}
|
||||
let k = k_raw * (1.0 - f64::from(self.freeze[idx]));
|
||||
@@ -553,10 +560,13 @@ impl LiquifyField {
|
||||
[(q[0] + dq[0] - p[0]) as f32, (q[1] + dq[1] - p[1]) as f32]
|
||||
}
|
||||
};
|
||||
writes.push((idx, new, self.freeze[idx]));
|
||||
row.push((idx, new, self.freeze[idx]));
|
||||
}
|
||||
}
|
||||
for (idx, d, f) in writes {
|
||||
row
|
||||
};
|
||||
let rows = j1 - j0 + 1;
|
||||
let writes = par::map(rows, rows * (i1 - i0 + 1) > PARALLEL_DAB_NODES, |row| node_row(j0 + row));
|
||||
for (idx, d, f) in writes.into_iter().flatten() {
|
||||
self.d[idx] = d;
|
||||
self.freeze[idx] = f;
|
||||
}
|
||||
@@ -929,18 +939,23 @@ impl ProxyImage {
|
||||
return false;
|
||||
}
|
||||
source_scratch.resize(source_len, [0.0; 4]);
|
||||
src.read_rgba_into(src_rect, source_scratch);
|
||||
if !src.format().alpha {
|
||||
for pixel in source_scratch.iter_mut() {
|
||||
pixel[3] = 1.0;
|
||||
// Read and premultiply the source in one pass per band of rows, the bands in parallel: at
|
||||
// an 800 px brush it is about a million pixels (P30).
|
||||
let opaque = !src.format().alpha;
|
||||
const BAND_ROWS: usize = 32;
|
||||
par::chunks_mut(source_scratch, sw * BAND_ROWS, true, |band_index, band| {
|
||||
let y = src_rect.y0 + (band_index * BAND_ROWS) as i32;
|
||||
src.read_rgba_into(Rect::new(src_rect.x0, y, src_rect.x1, y + (band.len() / sw) as i32), band);
|
||||
for pixel in band.iter_mut() {
|
||||
if opaque {
|
||||
pixel[3] = 1.0;
|
||||
}
|
||||
let alpha = pixel[3];
|
||||
pixel[0] *= alpha;
|
||||
pixel[1] *= alpha;
|
||||
pixel[2] *= alpha;
|
||||
}
|
||||
}
|
||||
for pixel in source_scratch.iter_mut() {
|
||||
let alpha = pixel[3];
|
||||
pixel[0] *= alpha;
|
||||
pixel[1] *= alpha;
|
||||
pixel[2] *= alpha;
|
||||
}
|
||||
});
|
||||
|
||||
let x0 = (region.x0 - bounds.x0) as usize;
|
||||
let x1 = (region.x1 - bounds.x0) as usize;
|
||||
|
||||
Reference in new issue
Block a user