mirror of
https://github.com/storytold/harfbuzz.git
synced 2026-11-21 06:51:01 +01:00
[gpu] Rename hb_gpu_draw_darken -> hb_gpu_stem_darken
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) <noreply@anthropic.com>
This commit is contained in:
1 parent
daddae08a3
commit
a44eb976dc
12 files changed
+13
-13
No files matched your search
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
+2
-2
@@ -300,7 +300,7 @@
|
||||
* # Stem darkening
|
||||
*
|
||||
* |[<!-- language="plain" -->
|
||||
* 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);
|
||||
* ]|
|
||||
**/
|
||||
@@ -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));
|
||||
|
||||
|
||||
@@ -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));
|
||||
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user