From a44eb976dc547859f36013d1608dbdf6a8b60648 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 13 Apr 2026 02:59:37 -0600 Subject: [PATCH] [gpu] Rename hb_gpu_draw_darken -> hb_gpu_stem_darken MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous commit renamed hb_gpu_darken to hb_gpu_draw_darken for symmetry with hb_gpu_draw (formerly hb_gpu_render). But the operation isn't draw-subsystem specific: it adjusts a coverage value based on foreground brightness and ppem, which is just the standard stem-darkening recipe. Name it after what it does. Paint doesn't need its own variant — it can call this same function on any alpha/coverage channel it produces. Assisted-by: Claude Opus 4.6 (1M context) --- src/hb-gpu-draw-fragment-glsl.hh | 2 +- src/hb-gpu-draw-fragment-hlsl.hh | 2 +- src/hb-gpu-draw-fragment-msl.hh | 2 +- src/hb-gpu-draw-fragment-wgsl.hh | 2 +- src/hb-gpu-draw-fragment.glsl | 2 +- src/hb-gpu-draw-fragment.hlsl | 2 +- src/hb-gpu-draw-fragment.msl | 2 +- src/hb-gpu-draw-fragment.wgsl | 2 +- src/hb-gpu.cc | 4 ++-- util/gpu/demo-metal.mm | 2 +- util/gpu/demo-shader.cc | 2 +- util/gpu/web/hb-gpu-web-webgpu.cc | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/hb-gpu-draw-fragment-glsl.hh b/src/hb-gpu-draw-fragment-glsl.hh index 79a93926c..925d185ed 100644 --- a/src/hb-gpu-draw-fragment-glsl.hh +++ b/src/hb-gpu-draw-fragment-glsl.hh @@ -325,7 +325,7 @@ static const char *hb_gpu_draw_fragment_glsl = " * brightness: foreground brightness in [0, 1]\n" " * ppem: pixels per em at this fragment\n" " */\n" -"float hb_gpu_draw_darken (float coverage, float brightness, float ppem)\n" +"float hb_gpu_stem_darken (float coverage, float brightness, float ppem)\n" "{\n" " return pow (coverage,\n" " mix (pow (2.0, brightness - 0.5), 1.0,\n" diff --git a/src/hb-gpu-draw-fragment-hlsl.hh b/src/hb-gpu-draw-fragment-hlsl.hh index efb7999aa..8b6a88197 100644 --- a/src/hb-gpu-draw-fragment-hlsl.hh +++ b/src/hb-gpu-draw-fragment-hlsl.hh @@ -311,7 +311,7 @@ static const char *hb_gpu_draw_fragment_hlsl = " * brightness: foreground brightness in [0, 1]\n" " * ppem: pixels per em at this fragment\n" " */\n" -"float hb_gpu_draw_darken (float coverage, float brightness, float ppem)\n" +"float hb_gpu_stem_darken (float coverage, float brightness, float ppem)\n" "{\n" " return pow (coverage,\n" " lerp (pow (2.0, brightness - 0.5), 1.0,\n" diff --git a/src/hb-gpu-draw-fragment-msl.hh b/src/hb-gpu-draw-fragment-msl.hh index ca12018c1..fbcc3e445 100644 --- a/src/hb-gpu-draw-fragment-msl.hh +++ b/src/hb-gpu-draw-fragment-msl.hh @@ -313,7 +313,7 @@ static const char *hb_gpu_draw_fragment_msl = " * brightness: foreground brightness in [0, 1]\n" " * ppem: pixels per em at this fragment\n" " */\n" -"float hb_gpu_draw_darken (float coverage, float brightness, float ppem)\n" +"float hb_gpu_stem_darken (float coverage, float brightness, float ppem)\n" "{\n" " return pow (coverage,\n" " mix (pow (2.0, brightness - 0.5), 1.0,\n" diff --git a/src/hb-gpu-draw-fragment-wgsl.hh b/src/hb-gpu-draw-fragment-wgsl.hh index 3bc6ea0f9..6a7896cbd 100644 --- a/src/hb-gpu-draw-fragment-wgsl.hh +++ b/src/hb-gpu-draw-fragment-wgsl.hh @@ -319,7 +319,7 @@ static const char *hb_gpu_draw_fragment_wgsl = " * brightness: foreground brightness in [0, 1]\n" " * ppem: pixels per em at this fragment\n" " */\n" -"fn hb_gpu_draw_darken (coverage: f32, brightness: f32, ppem: f32) -> f32\n" +"fn hb_gpu_stem_darken (coverage: f32, brightness: f32, ppem: f32) -> f32\n" "{\n" " return pow (coverage,\n" " mix (pow (2.0, brightness - 0.5), 1.0,\n" diff --git a/src/hb-gpu-draw-fragment.glsl b/src/hb-gpu-draw-fragment.glsl index c53f95fce..9dcae113f 100644 --- a/src/hb-gpu-draw-fragment.glsl +++ b/src/hb-gpu-draw-fragment.glsl @@ -324,7 +324,7 @@ float hb_gpu_draw (vec2 renderCoord, uint glyphLoc_) * brightness: foreground brightness in [0, 1] * ppem: pixels per em at this fragment */ -float hb_gpu_draw_darken (float coverage, float brightness, float ppem) +float hb_gpu_stem_darken (float coverage, float brightness, float ppem) { return pow (coverage, mix (pow (2.0, brightness - 0.5), 1.0, diff --git a/src/hb-gpu-draw-fragment.hlsl b/src/hb-gpu-draw-fragment.hlsl index a466b3584..54bf6abcf 100644 --- a/src/hb-gpu-draw-fragment.hlsl +++ b/src/hb-gpu-draw-fragment.hlsl @@ -310,7 +310,7 @@ float hb_gpu_draw (float2 renderCoord, uint glyphLoc_) * brightness: foreground brightness in [0, 1] * ppem: pixels per em at this fragment */ -float hb_gpu_draw_darken (float coverage, float brightness, float ppem) +float hb_gpu_stem_darken (float coverage, float brightness, float ppem) { return pow (coverage, lerp (pow (2.0, brightness - 0.5), 1.0, diff --git a/src/hb-gpu-draw-fragment.msl b/src/hb-gpu-draw-fragment.msl index 3c3f23d40..01ce6edc2 100644 --- a/src/hb-gpu-draw-fragment.msl +++ b/src/hb-gpu-draw-fragment.msl @@ -312,7 +312,7 @@ float hb_gpu_draw (float2 renderCoord, uint glyphLoc_, * brightness: foreground brightness in [0, 1] * ppem: pixels per em at this fragment */ -float hb_gpu_draw_darken (float coverage, float brightness, float ppem) +float hb_gpu_stem_darken (float coverage, float brightness, float ppem) { return pow (coverage, mix (pow (2.0, brightness - 0.5), 1.0, diff --git a/src/hb-gpu-draw-fragment.wgsl b/src/hb-gpu-draw-fragment.wgsl index 21e751be2..dbc6b8a54 100644 --- a/src/hb-gpu-draw-fragment.wgsl +++ b/src/hb-gpu-draw-fragment.wgsl @@ -318,7 +318,7 @@ fn hb_gpu_draw (renderCoord: vec2f, glyphLoc_: u32, * brightness: foreground brightness in [0, 1] * ppem: pixels per em at this fragment */ -fn hb_gpu_draw_darken (coverage: f32, brightness: f32, ppem: f32) -> f32 +fn hb_gpu_stem_darken (coverage: f32, brightness: f32, ppem: f32) -> f32 { return pow (coverage, mix (pow (2.0, brightness - 0.5), 1.0, diff --git a/src/hb-gpu.cc b/src/hb-gpu.cc index 077e1cdf2..404be3296 100644 --- a/src/hb-gpu.cc +++ b/src/hb-gpu.cc @@ -300,7 +300,7 @@ * # Stem darkening * * |[ - * float hb_gpu_draw_darken (float coverage, float brightness, float ppem); + * float hb_gpu_stem_darken (float coverage, float brightness, float ppem); * ]| * * Optional stem darkening adjusts coverage at small sizes so @@ -323,6 +323,6 @@ * float brightness = dot (u_foreground.rgb, vec3 (1.0 / 3.0)); * float ppem = 1.0 / max (fwidth (v_texcoord).x, * fwidth (v_texcoord).y); - * coverage = hb_gpu_draw_darken (coverage, brightness, ppem); + * coverage = hb_gpu_stem_darken (coverage, brightness, ppem); * ]| **/ diff --git a/util/gpu/demo-metal.mm b/util/gpu/demo-metal.mm index 873926a35..d52b24c25 100644 --- a/util/gpu/demo-metal.mm +++ b/util/gpu/demo-metal.mm @@ -64,7 +64,7 @@ fragment float4 fragment_main(VertexOut in [[stage_in]], /* Stem darkening / thinning at small sizes. */ if (uniforms.stem_darkening > 0.0) - coverage = hb_gpu_draw_darken(coverage, + coverage = hb_gpu_stem_darken(coverage, dot(uniforms.foreground.rgb, float3(1.0 / 3.0)), 1.0 / max(fwidth(in.texcoord).x, fwidth(in.texcoord).y)); diff --git a/util/gpu/demo-shader.cc b/util/gpu/demo-shader.cc index 483d4518d..c6e24a9a7 100644 --- a/util/gpu/demo-shader.cc +++ b/util/gpu/demo-shader.cc @@ -53,7 +53,7 @@ void main () * Dark text on light: stems get too thin → darken them (exponent < 1). * The foreground brightness tells us which mode we're in. */ if (u_stem_darkening > 0.0) - coverage = hb_gpu_draw_darken (coverage, + coverage = hb_gpu_stem_darken (coverage, dot (u_foreground.rgb, vec3 (1.0 / 3.0)), hb_gpu_ppem (v_texcoord, v_glyphLoc)); diff --git a/util/gpu/web/hb-gpu-web-webgpu.cc b/util/gpu/web/hb-gpu-web-webgpu.cc index c491e72e6..384868df2 100644 --- a/util/gpu/web/hb-gpu-web-webgpu.cc +++ b/util/gpu/web/hb-gpu-web-webgpu.cc @@ -106,7 +106,7 @@ struct VertexOutput { var coverage = hb_gpu_draw (in.texcoord, in.glyphLoc, &hb_gpu_atlas); if (u.stem_darkening > 0.0) { - coverage = hb_gpu_draw_darken (coverage, + coverage = hb_gpu_stem_darken (coverage, dot (u.foreground.rgb, vec3f (1.0 / 3.0)), 1.0 / max (fwidth (in.texcoord).x, fwidth (in.texcoord).y)); }