Commit Graph
15610 Commits
Author SHA1 Message Date
Behdad Esfahbod 6bfdaabc8a raster-paint: specialize rect clip hot loops 2026-02-23 23:48:18 -03:00
Behdad Esfahbod 46782abcaa [raster] Micro-optimize 2026-02-23 23:28:59 -03:00
Behdad EsfahbodandClaude Opus 4.6 d7d17ee055 raster: fix winding carry for edges left of the surface
When an edge fell to the left of the rendering surface (col < 0),
cell_add() discarded its winding contribution entirely.  For glyphs
whose outlines extend beyond the surface bounds (e.g. COLR v1
spliceMask clip glyphs), this caused the interior winding number to
stay zero, producing empty rasterizations.

Fix by forwarding the cover delta to column 0 so the left-to-right
sweep picks up the correct accumulated winding.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-23 22:31:24 -03:00
Behdad Esfahbod 1350d2a470 [cmap] Fix CodeXL warning
Fixes https://github.com/harfbuzz/harfbuzz/issues/5753
2026-02-23 18:44:50 -03:00
Behdad Esfahbod 742f79da08 raster: remove extents_from_glyph_extents API
Remove hb_raster_extents_from_glyph_extents and switch callers to the new transform-aware set_glyph_extents APIs on raster draw/paint. Also add test coverage for transformed glyph extents and update section symbol listings.
2026-02-23 12:10:41 -03:00
Behdad Esfahbod dc532931d6 raster: streamline scanline hot paths 2026-02-22 19:26:42 -03:00
Behdad Esfahbod 5f4319400b [raster-draw] Combine two passes
20% speedup. Devised by codex.
2026-02-22 19:20:34 -03:00
Behdad Esfahbod d6be64a89b [raster] Remove duplicate documentation block
https://github.com/harfbuzz/harfbuzz/pull/5749#pullrequestreview-3838613326
2026-02-22 18:59:06 -03:00
Behdad Esfahbod 85ea4f92cf raster: match FreeType quadratic recursive flatness criterion
This is also slower than what we have, but produces much closer
results to FreeType.
2026-02-22 18:18:39 -03:00
Behdad Esfahbod 07c82109c4 raster: match FreeType cubic recursive flatness criterion
This is slightly slower, but matches FreeType rasterization for OTF
fonts much better.
2026-02-22 18:13:41 -03:00
Behdad Esfahbod 603ea5e1f2 raster-paint: require explicit extents and add helper 2026-02-22 15:18:40 -03:00
Behdad Esfahbod 830c097d09 raster-paint: clear internal render state between calls 2026-02-22 15:03:39 -03:00
Behdad Esfahbod 9683497463 Revert "raster: fix seam at shared contour endpoints via row splitting"
This reverts commit 6f4ad84ce5d6a69260c03b7dfc727a09dbe0a6dc.
2026-02-22 14:21:09 -03:00
Behdad EsfahbodandClaude Opus 4.6 8788d49250 raster: fix seam at shared contour endpoints via row splitting
Pre-compute seam rows during edge bucketing where one edge's yH matches
another edge's yL at a mid-pixel-row y-coordinate. For these rare rows
(typically 2 per glyph), split into two sub-rows and sum absolute alpha
values to avoid winding cancellation. Non-seam rows take the exact same
code path with only a single branch check overhead.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-22 14:21:09 -03:00
Behdad Esfahbod e66df7ac66 Revert "raster: fix seam at shared contour endpoints by splitting row"
This reverts commit af884ced9e76b630178a338584031b5ae127d95a.
2026-02-22 14:21:09 -03:00
Behdad EsfahbodandClaude Opus 4.6 cff6be61b9 raster: fix seam at shared contour endpoints by splitting row
When two contours share a y coordinate that falls mid-pixel-row,
their edges contribute opposite-winding cover values at different
fractional heights.  The analytic formula |cover·512 − area|
computes the signed sum, which partially cancels, producing a
visible one-row artifact.

Fix by detecting these seam rows (an edge yH matching another
edge's yL within the same pixel row) and splitting into sub-rows.
Each sub-row's |cover·512 − area| is computed independently, then
the absolute alpha values are summed.  This gives correct coverage
because each sub-row has consistent winding direction.

Performance impact is negligible: seam detection piggybacks on the
existing edge-removal loop (zero cost for non-seam rows), and
sub-row processing only runs for the rare seam rows (typically 1-2
per glyph).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-22 14:21:09 -03:00
Behdad EsfahbodandClaude Opus 4.6 174a2f3b3d raster: fix sweep gradient angle mapping and REFLECT extend mode
Two bugs fixed:
- atan2f returns [-pi,pi] but sweep gradient angles are in [0,2*pi];
  normalize pixel angle to [0,2*pi) so the seam matches the OT spec.
- REFLECT extend mode was identical to REPEAT because floorf after
  the initial mod made period always 0.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-22 02:05:06 -03:00
Behdad EsfahbodandClaude Opus 4.6 a544ff5d6d raster: fix clip rectangle for non-axis-aligned transforms
When the current transform has rotation/skew, push_clip_rectangle now
rasterizes the actual transformed quad using edge cross-product tests
instead of approximating with an axis-aligned bounding box.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-22 01:40:45 -03:00
Behdad EsfahbodandClaude Opus 4.6 63d7a12963 raster: optimize paint loops to skip transparent clip regions
Track bounding box (min_x/y, max_x/y) on all clip masks. Paint
callbacks (solid fill, image, gradients) now iterate only within
the clip bounding box instead of the full surface.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-22 01:39:29 -03:00
Behdad EsfahbodandClaude Opus 4.6 7585a488f1 raster: move compositing code to hb-raster-image.cc
Move pixel helpers (div255, src_over, alpha_mul, pack_pixel) to
hb-raster.hh as shared inline functions with hb_raster_ prefix.
Move all blend mode implementations and hb_raster_composite_images()
to hb-raster-image.cc for reuse outside of paint.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-22 01:35:19 -03:00
Behdad EsfahbodandClaude Opus 4.6 400a80282a raster: implement all 28 composite blend modes
Implement the full set of hb_paint_composite_mode_t blend modes:
- Porter-Duff (13): CLEAR, SRC, DEST, SRC_OVER, DEST_OVER, SRC_IN,
  DEST_IN, SRC_OUT, DEST_OUT, SRC_ATOP, DEST_ATOP, XOR, PLUS
- Separable (11): MULTIPLY, SCREEN, OVERLAY, DARKEN, LIGHTEN,
  COLOR_DODGE, COLOR_BURN, HARD_LIGHT, SOFT_LIGHT, DIFFERENCE, EXCLUSION
- HSL (4): HUE, SATURATION, COLOR, LUMINOSITY

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-22 01:31:28 -03:00
Behdad EsfahbodandClaude Opus 4.6 a6952e6523 raster: add hb_raster_paint_set_foreground() API
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-22 01:29:53 -03:00
Behdad EsfahbodandClaude Opus 4.6 49838acdad raster: add hb_raster_paint_t for color glyph rendering
Implement a software paint backend (hb_raster_paint_t) that renders
COLRv0/v1 color glyphs into BGRA32 pixel buffers with no external
dependencies. Implements all 14 hb_paint_funcs_t callbacks including
solid fills, linear/radial/sweep gradients, glyph clipping, rectangle
clipping, group compositing, and BGRA image blitting.

Update hb-raster utility to detect color fonts and use the paint path,
outputting PPM (RGB) instead of PGM (greyscale).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-22 01:24:44 -03:00
Behdad Esfahbod 5e4c105c6f cairo: remove raster mode API and hb-view --raster 2026-02-22 00:20:31 -03:00
Behdad Esfahbod dd4758159a raster: use cubic curve-based chord error bound 2026-02-21 20:06:05 -03:00
Behdad EsfahbodandClaude Sonnet 4.6 6421457605 hb-raster: introduce HB_RASTER_FLAT_THRESH
Define HB_RASTER_FLAT_THRESH 0.25f for the maximum Bézier deviation in
pixels; each flattener squares it locally.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-02-21 19:49:15 -03:00
Behdad Esfahbod c05dcff644 hb-raster: Remove stale comment 2026-02-21 19:33:28 -03:00
Behdad EsfahbodandClaude Sonnet 4.6 811da7bf30 hb-raster: use forward differencing for cubic Bézier flattening
Same approach as the quadratic: control-point deviation also shrinks 4×
per de Casteljau subdivision, so err² shrinks 16× per level, giving the
same upfront subdivision-count formula.  The cubic adds a constant third
difference d³f = 6·a·h³ and one extra accumulator in the inner loop.

Keep the recursive de Casteljau version as flatten_cubic_recursive
(static HB_UNUSED inline, depth=0 default).  flatten_cubic() dispatches
to flatten_cubic_fd() by default.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-02-21 19:29:26 -03:00
Behdad EsfahbodandClaude Sonnet 4.6 1f873fc632 hb-raster: keep both quadratic flatteners, dispatch to forward-differencing
Revive the recursive de Casteljau flattener as flatten_quadratic_recursive
(static inline, depth=0 default argument) alongside the forward-differencing
flatten_quadratic_fd.  flatten_quadratic() dispatches to the fd variant by
default.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-02-21 19:22:56 -03:00
Behdad EsfahbodandClaude Opus 4.6 f3be7f2ef1 hb-raster: use forward differencing for quadratic Bézier flattening
Exploit the property that quadratic Bézier error shrinks exactly 4×
per de Casteljau subdivision.  Compute the subdivision count upfront,
then iterate with constant-cost additions (forward differencing)
instead of recursive branching.  ~1.5% speedup.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 19:05:50 -03:00
Behdad Esfahbod 38a3c13ec7 hb-raster: Use 8 bytes subpixel resolution
So we can generate smooth 256 levels of horizontal/vertical lines.
2026-02-21 18:38:04 -03:00
Behdad EsfahbodandClaude Opus 4.6 3ba27ca777 hb-raster: make fixed-point precision configurable
Replace all hardcoded 64/63/6/128/8192/4096/13 constants with
HB_RASTER_PIXEL_BITS / HB_RASTER_ONE_PIXEL / HB_RASTER_PIXEL_MASK /
HB_RASTER_FULL_COVERAGE macros.  Changing HB_RASTER_PIXEL_BITS from
6 (26.6, current) to 8 (24.8, like FreeType's rasterizer) switches
the entire pipeline.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 18:27:24 -03:00
Behdad EsfahbodandClaude Opus 4.6 ecce9de28a hb-raster: pass y_top directly to edge_sweep_row
Avoid recomputing y_top = py << 6 inside edge_sweep_row; the caller
already has it.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 18:08:19 -03:00
Behdad EsfahbodandClaude Opus 4.6 f8bcf23d33 hb-raster: defer ×128 scaling from prefix sum to SIMD sweep
Remove the clamp and ×128 multiply from the prefix_sum_cover loop,
leaving just accumulate + store.  The ×128 (<<7) is done in the
NEON/SSE2 sweep after widening to int32, where it's a free instruction.

The clamp is no longer needed: raw cover_accum fits int16 for any
reasonable font, and the alpha formula already clamps |val| to 8192.

~20% speedup at size 200.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 18:03:29 -03:00
Behdad Esfahbod da2f665d6a hb-raster: Use a vector extend() 2026-02-21 17:30:28 -03:00
Behdad Esfahbod 8c987819b7 Revert "hb-raster: process single-row edges without active-edge list"
This reverts commit 541d7dab7bbf1a89103edda43ca58617408eb8bb.
2026-02-21 17:29:05 -03:00
Behdad EsfahbodandClaude Opus 4.6 e0a19e3543 hb-raster: process single-row edges without active-edge list
New bucket edges are processed inline for the current row.  Only edges
that span beyond the current row are added to the active list.  This
avoids push/remove_unordered churn for the majority of flattened curve
segments which typically span only 1-3 pixel rows.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 17:29:05 -03:00
Behdad EsfahbodandClaude Opus 4.6 2b8d16dde0 hb-raster: clamp cover_accum to avoid int16 overflow
Clamp cover_accum to [-64, 64] via hb_clamp before multiplying by 128
in the prefix sum.  Without the clamp, overlapping contours with
winding count > 3 would produce cover_accum * 128 > 32767, overflowing
int16.  The clamp is semantically correct since the alpha formula
already clamps |val| to 8192 (full coverage).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 17:29:05 -03:00
Behdad EsfahbodandClaude Opus 4.6 13a6f251e8 hb-raster: split image API into hb-raster-image.cc
Move hb_raster_image_t implementation into its own file.  hb-raster.cc
now contains only the SECTION documentation header.  File layout:

  hb-raster.cc       — SECTION docs
  hb-raster-image.cc — hb_raster_image_t API
  hb-raster-draw.cc  — hb_raster_draw_t API + rasterizer
  hb-raster.hh       — shared hb_raster_image_t struct definition

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 17:29:05 -03:00
Behdad EsfahbodandClaude Opus 4.6 a089a19c76 hb-raster: move draw-specific types from .hh to hb-raster-draw.cc
Move hb_raster_edge_t and hb_raster_draw_t struct definitions into
hb-raster-draw.cc since they are only used there.  hb-raster.hh now
contains only hb_raster_image_t, shared between the two .cc files.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 17:29:05 -03:00
Behdad EsfahbodandClaude Opus 4.6 65c16d7472 hb-raster: split draw/rasterizer into hb-raster-draw.cc
Move all hb_raster_draw_t implementation (API, draw callbacks, Bézier
flattening, analytic coverage rasterizer, SIMD sweep) into its own
file.  hb-raster.cc keeps only the hb_raster_image_t API and the
SECTION header.  hb-raster.hh remains as the shared internal header.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 17:29:05 -03:00
Behdad EsfahbodandClaude Opus 4.6 3b34cf93d2 hb-raster: replace edge sort with O(n) bucket-by-row
Bucket edges by their starting pixel row during render instead of
sorting.  Maintain an active edge list with O(1) removal via
remove_unordered().  Only grow the bucket vector-of-vectors, never
shrink, so inner vectors keep their allocations across renders.

Eliminates the O(n log n) sort that was dominating render time.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 17:29:05 -03:00
Behdad EsfahbodandClaude Opus 4.6 7d008bf735 hb-raster: add hb_raster_draw_recycle_image() for zero-malloc rendering
Add API to recycle a rendered image back to the rasterizer.  The draw
object keeps the image and its buffer for reuse by the next render()
call.  After the first render+recycle cycle, render() does zero
mallocs (the image struct and pixel buffer are both reused).

Also switch hb_raster_image_t to use hb_vector_t<uint8_t> for its
pixel buffer so resize tracking is automatic.

Update hb-raster-all benchmark to use recycling.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 17:29:05 -03:00
Behdad EsfahbodandClaude Opus 4.6 14ffc6f874 hb-raster: cache row_area/row_cover in hb_raster_draw_t
Move the per-row working arrays into the rasterizer object so they
persist across render() calls and only realloc when width grows.
Use resize_dirty() since we memset immediately after.  Reduces
per-render mallocs from 5 to 3 (image struct + pixel buffer remain).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 17:29:05 -03:00
Behdad EsfahbodandClaude Opus 4.6 10a486dcce hb-raster: split render into named functions for profiling
Extract rasterize_edges_to_cells(), prefix_sum_cover(), and
sweep_row_to_alpha() from hb_raster_draw_render() so they show up
individually in flamegraphs.  Mark cell_add and edge_sweep_row as
HB_ALWAYS_INLINE.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 17:29:05 -03:00
Behdad EsfahbodandClaude Opus 4.6 967633ef61 hb-raster: use .arrayZ[] instead of operator[] in hot paths
Bypass hb_vector_t bounds checking in the edge iteration, prefix sum,
and scalar sweep loops.  Profiling showed 24% of time in operator[].

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 17:29:05 -03:00
Behdad EsfahbodandClaude Opus 4.6 2a2fc9a9da hb-raster: reduce sweep memory traffic
- Use int16 for the cover array (values max ±8192, fits int16).
  Halves cover array footprint; NEON loads 8×int16 and widens.
- When cover doesn't cancel at row end, compute the constant alpha
  byte once and memset the output tail instead of filling, sweeping,
  and clearing the working arrays.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 17:29:05 -03:00
Behdad EsfahbodandClaude Opus 4.6 920c5605bb hb-raster: fix -Wcast-align warnings in SSE2 path
Cast through void* before __m128i* to silence Clang's -Wcast-align.
The _mm_loadu/storeu intrinsics handle unaligned access correctly;
the warning is spurious.

Also document hb_raster_image_t and hb_raster_draw_t typedefs in
hb-raster.h.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 17:29:05 -03:00
Behdad EsfahbodandClaude Opus 4.6 0b97882e58 hb-raster: add GTK-Doc comments for all public API
Document all hb_raster_image_t and hb_raster_draw_t functions with
GTK-Doc style comments.  Add SECTION header for hb-raster.  Fix
hb_cairo_font_face_set/get_raster() doc comments to use XSince and
standard Return value format.

Also add hb-raster section to harfbuzz-sections.txt and include
hb-raster.xml in harfbuzz-docs.xml Integration API chapter.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 17:29:05 -03:00
Behdad EsfahbodandClaude Opus 4.6 914d2c12ed hb-raster: fix sparse sweep when cover doesn't cancel at row end
The prefix sum of cover propagates across the entire row, but the
sparse x_min/x_max tracking only covered cells directly written by
edges.  When the right edge falls on the image boundary (out of
bounds), the sweep stopped at the left edge column, leaving interior
pixels at zero.

Fix by extending the sweep to width-1 when cover_accum is non-zero
after the prefix sum, filling the extended range with the constant
accumulated cover value.  For well-formed closed shapes where edges
cancel, x_end == x_max and there is no extra work.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-02-21 17:29:05 -03:00