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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Move perf tools from perf/ and test/raster/ to util/ alongside the
other uninstalled utilities. Remove the now-empty test/raster/ directory.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Same shaping/positioning pipeline as hb-raster but uses FreeType's
rasterizer (FT_Outline_Render) instead of hb_raster. Useful for
comparing coverage values between the two rasterizers.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
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>
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>
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>
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>
- 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>
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>
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>
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>
Mirror the NEON vectorized sweep for x86-64 using pure SSE2 baseline
intrinsics (no SSSE3/SSE4.1 required). Emulates abs, min, and
multiply-by-255 with basic SSE2 ops.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Split the per-row sweep into a sequential prefix-sum pass followed by
a vectorized alpha computation pass. The NEON path processes 8 pixels
per iteration using vabsq/vminq/vmlaq and narrows to bytes in-place.
Significant speedup at large font sizes where wide scanlines dominate.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Precompute delta_fy = 64 * total_dy / total_dx once per edge per row,
then accumulate instead of dividing per column.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Replace dx/dy fields with a 16.16 fixed-point slope precomputed at
edge creation time. The two integer divisions per edge per scanline
in edge_sweep_row become multiply+shift. Same struct size.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Maintain a monotonically-advancing start index that skips past edges
whose yH has fallen below the current row. This avoids re-scanning
the dead prefix of the sorted edge array on every scanline.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
- Use hb_qsort() instead of qsort() to avoid function-pointer overhead
- Use >> 13 instead of / 8192 for alpha computation (unsigned shift)
- Track per-row x_min/x_max of touched cells; only sweep and clear
that range instead of memset'ing the full width every row
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Replace the multi-sample tile rasterizer (NEON / SSE4.1 / scalar variants)
with an analytic-coverage approach that computes exact area and cover
contributions per pixel cell per edge. This eliminates the tile bookkeeping
(tile_offsets, tile_edge_indices) and SIMD-specific code paths in favour of
a simpler, portable scanline sweep that yields higher quality output.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Instead of rendering the hb-raster image at subpixel resolution
(x_scale = font_size * 64 units/em, causing Cairo to resample 64×),
render at device-pixel resolution using the scale_matrix from the
scaled font.
The rasterizer transform is set to (px_x/x_scale, 0, 0, px_y/y_scale)
where px_x = scale_matrix.xx = font_size in device pixels per em.
The image is then placed with cairo_scale(1/px_x, -1/px_y) to map
raster pixels 1:1 to device pixels with Y-flip.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
When enabled, hb_cairo_render_glyph() rasterizes via hb_raster and
blits the A8 coverage image using cairo_mask_surface(), leaving the
existing Cairo source undisturbed.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Renders every glyph in a font through the rasterizer.
Args: font-file [font-size-px] [output-dir]
font-size defaults to upem; output-dir writes per-glyph PGMs when given.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Renders shaped text into a single auto-sized A8 PGM raster image,
written to stdout or --output-file. Mirrors util/hb-draw in structure.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Renders glyph IDs 2-5 from fonts/adwaita.ttf at upem scale, writes
PGMs to /tmp/ for visual inspection, and asserts non-zero coverage.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Fix out-of-bounds pixel write in rasterize_tile: border tiles that
extend past the image edge were writing px-x_origin beyond the row
stride, wrapping into the start of the next row and overwriting
correctly-rasterized pixels with zero. Pass px1/py1 (exclusive
bounds) to rasterize_tile and clip the pixel loops accordingly.
Also: drop unused ex0 in pass 2 of tile assignment; move test-raster
from src/ to test/api/ and convert it to the GLib g_assert/hb_test_add
framework.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
New library harfbuzz-raster provides a fast CPU coverage rasterizer for
glyph outlines. Three public types: hb_raster_image_t (ref-counted pixel
buffer), hb_raster_draw_t (outline rasterizer consuming hb_draw_funcs_t
callbacks), and a stub for hb_raster_paint_t (v2).
Key design points:
- Nonzero winding rule
- 26.6 fixed-point edge representation
- 8-sample supersampling per pixel (HB_RASTER_SAMPLES constant)
- 16×16 tile culling with CSR edge lists
- SIMD inner loops: NEON (aarch64) and SSE4.1 (x86); scalar fallback
- Bézier flattening (quadratic + cubic) via de Casteljau, max depth 16
- Auto-size from edge bounding box or caller-supplied extents
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Add bool exact=false parameter to all extend() overloads. When true,
the allocation is exact (no growth headroom), useful for copy
constructors. Pass exact=true from the Iterable copy constructor.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
extend(Iterable) called alloc(hb_len(iter)) which only allocated
space for the new elements, ignoring existing length. When the
vector already had content, push_has_room would write past the
allocated buffer.
Fix: alloc(length + hb_len(iter)).
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* [buffer] Fix a typo and doc string
* [buffer] Add merge_grapheme_clusters / merge_out_grapheme_clusters
Cluster merges serve two distinct purposes that require different level
gates:
- Grapheme grouping: combining marks merged into their base cluster.
Correct gate: IS_GRAPHEMES (levels 0 and 3).
New functions: merge_grapheme_clusters / merge_out_grapheme_clusters.
- Monotonicity maintenance: clusters merged to prevent non-monotone
output after ligature formation, reordering, etc.
Correct gate: IS_MONOTONE (levels 0 and 1).
Existing functions: merge_clusters / merge_out_clusters.
Previously both paths shared merge_clusters_impl's single IS_MONOTONE
gate, so GRAPHEMES (level 3) was incorrectly blocked from merging
grapheme clusters. This also caused a regression in the Thai and
Hangul shapers for MONOTONE_CHARACTERS (level 1): when their explicit
== MONOTONE_GRAPHEMES call-site guards were removed in #5069, the
impls' IS_MONOTONE gate no longer protected them.
Gates are now in the inline wrappers in hb-buffer.hh; the _impl
functions are gate-free. hb_form_clusters, CoreText grapheme
detection, and the Thai/Hangul shapers are updated to call the
grapheme-semantic variants. Fixes#5750.
Fixes https://github.com/harfbuzz/harfbuzz/issues/5751
Fixes https://github.com/harfbuzz/harfbuzz/issues/5750
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* [thai] Adjust grapheme merging logic
* [hangul] Tweak grapheme merging
---------
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>