mirror of
https://github.com/storytold/harfbuzz.git
synced 2026-11-19 22:11:04 +01:00
This commit unblocks end-to-end paint rendering on the WebGPU demo, adds the HLSL port, and avoids losing MSAA or stem darkening along the way. ### Shared: _hb_gpu_draw_impl hb_gpu_draw internally did fwidth(renderCoord) + MSAA. That works fine in the single-call-per-fragment case but not when called from inside a non-uniform branch (e.g. an op-stream LAYER_SOLID conditional in the paint fragment shader) -- WGSL rejects fwidth from non-uniform control flow. Factor the MSAA-aware body into _hb_gpu_draw_impl, which takes a caller-supplied pixelsPerEm. hb_gpu_draw is now a thin wrapper that computes pixelsPerEm via fwidth and delegates. The paint fragment shader in every language now computes pixelsPerEm once at the top of hb_gpu_paint and calls _hb_gpu_draw_impl per layer -- MSAA preserved, no redundant fwidth calls per layer. In WGSL, _hb_gpu_draw_impl also inlines the ppem computation from pixelsPerEm rather than recurring into hb_gpu_ppem (which itself calls fwidth). ### Paint shaders - hb-gpu-paint-fragment.hlsl (new): HLSL transcription. Assumes a caller-declared StructuredBuffer<float4> hb_gpu_palette at register(t1). - hb-gpu-paint-fragment.wgsl: switched from hb_gpu_draw to _hb_gpu_draw_impl; comment updated. - hb-gpu-paint-fragment.msl, .glsl: same switch, cached pixelsPerEm at entry. hb_gpu_paint_shader_source() now returns content for all four languages. ### Demos - util/gpu/demo-fragment.glsl: restores stem darkening (dropped in the first paint wiring commit); applies to the premultiplied RGBA by scaling both colour and alpha. The desktop GL demo regenerates demo-fragment-glsl.hh from this source. - util/gpu/web/hb-gpu-web-webgpu.cc: WGSL fs_main concatenates the paint source, binds a zero-filled palette storage buffer at @group(0) @binding(2), and restores stem darkening. fwidth hoisted outside the stem-darkening conditional so WGSL's derivative-uniformity rule is happy. - util/gpu/demo-renderer-d3d11.cc: HLSL ps_main switches to hb_gpu_paint. Adds a second StructuredBuffer<float4> hb_gpu_palette at t1, zero-filled for now, bound alongside the atlas SRV. ### Misc - perf/benchmark-gpu.cc: fix stale reset/encode(draw) calls. Measured build (local Emscripten): WebGL index.wasm : 443638 181640 gz WebGPU webgpu.wasm : 461626 188400 gz COLRv0 rendering (BungeeTint, Noto Color Emoji, etc.) now works end-to-end on WebGL and WebGPU with the correct palette. Metal and D3D11 demos should likewise compile against the new shader flow; real palette upload cross-backend remains a TODO. Assisted-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>