From 24e1bde6f20c2bb8bad29a4e05be3a684ff7a8ac Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 14 Apr 2026 18:27:12 -0600 Subject: [PATCH] [gpu] Name composite modes; approximate unsupported ones a) Add inline /* MODE_NAME */ comments next to each mode == N branch in all four paint-shader languages. The numbers were bare hb_paint_composite_mode_t values; the comments match. b) Approximate unsupported modes with the nearest Porter-Duff mode rather than silently SRC_OVER'ing them: OVERLAY (14) / COLOR_BURN (18) / HARD_LIGHT (19) -> MULTIPLY COLOR_DODGE (17) / SOFT_LIGHT (20) -> SCREEN DIFFERENCE (21), EXCLUSION (22) and HSL_HUE..HSL_LUMINOSITY (24-27) still fall through to SRC_OVER -- they're not similar enough to anything we have to be worth a misleading approximation. Assisted-by: Claude Opus 4.6 (1M context) --- src/hb-gpu-paint-fragment-glsl.hh | 11 ++++++- src/hb-gpu-paint-fragment-hlsl.hh | 43 ++++++++++++++++----------- src/hb-gpu-paint-fragment-msl.hh | 48 ++++++++++++++++++++----------- src/hb-gpu-paint-fragment-wgsl.hh | 46 +++++++++++++++++------------ src/hb-gpu-paint-fragment.glsl | 11 ++++++- src/hb-gpu-paint-fragment.hlsl | 43 ++++++++++++++++----------- src/hb-gpu-paint-fragment.msl | 48 ++++++++++++++++++++----------- src/hb-gpu-paint-fragment.wgsl | 46 +++++++++++++++++------------ 8 files changed, 192 insertions(+), 104 deletions(-) diff --git a/src/hb-gpu-paint-fragment-glsl.hh b/src/hb-gpu-paint-fragment-glsl.hh index 50d045f85..e5e33171a 100644 --- a/src/hb-gpu-paint-fragment-glsl.hh +++ b/src/hb-gpu-paint-fragment-glsl.hh @@ -194,6 +194,14 @@ static const char *hb_gpu_paint_fragment_glsl = "{\n" " vec4 r = src + dst * (1.0 - src.a); /* SRC_OVER default */\n" "\n" +" /* Approximate unsupported COLRv1 modes with the nearest Porter-Duff\n" +" * mode we do implement. Better a recognizable rendering than a\n" +" * silent SRC_OVER fallback. DIFFERENCE / EXCLUSION / HSL_* are\n" +" * not similar enough to anything we have, so they still fall\n" +" * through to SRC_OVER below. */\n" +" if (mode == 14 || mode == 18 || mode == 19) mode = 23; /* OVERLAY / COLOR_BURN / HARD_LIGHT -> MULTIPLY */\n" +" else if (mode == 17 || mode == 20) mode = 13; /* COLOR_DODGE / SOFT_LIGHT -> SCREEN */\n" +"\n" " if (mode == 0) r = vec4 (0.0); /* CLEAR */\n" " else if (mode == 1) r = src; /* SRC */\n" " else if (mode == 2) r = dst; /* DST */\n" @@ -229,7 +237,8 @@ static const char *hb_gpu_paint_fragment_glsl = " + src.rgb * dst.rgb;\n" " r.a = src.a + dst.a - src.a * dst.a;\n" " }\n" -" /* SRC_OVER (3) and any unsupported mode use the default `r`. */\n" +" /* SRC_OVER (3) and DIFFERENCE / EXCLUSION / HSL_* (21, 22, 24-27)\n" +" * fall through to the SRC_OVER default. */\n" "\n" " return r;\n" "}\n" diff --git a/src/hb-gpu-paint-fragment-hlsl.hh b/src/hb-gpu-paint-fragment-hlsl.hh index aff0a8126..1559c4c23 100644 --- a/src/hb-gpu-paint-fragment-hlsl.hh +++ b/src/hb-gpu-paint-fragment-hlsl.hh @@ -155,39 +155,48 @@ static const char *hb_gpu_paint_fragment_hlsl = "\n" "float4 _hb_gpu_composite (float4 src, float4 dst, int mode)\n" "{\n" -" float4 r = src + dst * (1.0 - src.a);\n" +" float4 r = src + dst * (1.0 - src.a); /* SRC_OVER default */\n" "\n" -" if (mode == 0) r = float4 (0.0, 0.0, 0.0, 0.0);\n" -" else if (mode == 1) r = src;\n" -" else if (mode == 2) r = dst;\n" -" else if (mode == 4) r = dst + src * (1.0 - dst.a);\n" -" else if (mode == 5) r = src * dst.a;\n" -" else if (mode == 6) r = dst * src.a;\n" -" else if (mode == 7) r = src * (1.0 - dst.a);\n" -" else if (mode == 8) r = dst * (1.0 - src.a);\n" -" else if (mode == 9) r = src * dst.a + dst * (1.0 - src.a);\n" -" else if (mode == 10) r = dst * src.a + src * (1.0 - dst.a);\n" -" else if (mode == 11) r = src * (1.0 - dst.a) + dst * (1.0 - src.a);\n" -" else if (mode == 12) r = min (src + dst, float4 (1.0, 1.0, 1.0, 1.0));\n" -" else if (mode == 13) {\n" +" /* Mode numbers match hb_paint_composite_mode_t. Approximate\n" +" * unsupported modes with the nearest Porter-Duff mode we do\n" +" * implement; DIFFERENCE / EXCLUSION / HSL_* still fall through to\n" +" * SRC_OVER below. */\n" +" if (mode == 14 || mode == 18 || mode == 19) mode = 23; /* OVERLAY / COLOR_BURN / HARD_LIGHT -> MULTIPLY */\n" +" else if (mode == 17 || mode == 20) mode = 13; /* COLOR_DODGE / SOFT_LIGHT -> SCREEN */\n" +"\n" +" if (mode == 0) r = float4 (0.0, 0.0, 0.0, 0.0); /* CLEAR */\n" +" else if (mode == 1) r = src; /* SRC */\n" +" else if (mode == 2) r = dst; /* DST */\n" +" else if (mode == 4) r = dst + src * (1.0 - dst.a); /* DST_OVER */\n" +" else if (mode == 5) r = src * dst.a; /* SRC_IN */\n" +" else if (mode == 6) r = dst * src.a; /* DST_IN */\n" +" else if (mode == 7) r = src * (1.0 - dst.a); /* SRC_OUT */\n" +" else if (mode == 8) r = dst * (1.0 - src.a); /* DST_OUT */\n" +" else if (mode == 9) r = src * dst.a + dst * (1.0 - src.a); /* SRC_ATOP */\n" +" else if (mode == 10) r = dst * src.a + src * (1.0 - dst.a); /* DST_ATOP */\n" +" else if (mode == 11) r = src * (1.0 - dst.a) + dst * (1.0 - src.a); /* XOR */\n" +" else if (mode == 12) r = min (src + dst, float4 (1.0, 1.0, 1.0, 1.0)); /* PLUS */\n" +" else if (mode == 13) { /* SCREEN (premul) */\n" " r.rgb = src.rgb + dst.rgb - src.rgb * dst.rgb;\n" " r.a = src.a + dst.a - src.a * dst.a;\n" " }\n" -" else if (mode == 15) {\n" +" else if (mode == 15) { /* DARKEN */\n" " r.rgb = min (src.rgb * dst.a, dst.rgb * src.a)\n" " + src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a);\n" " r.a = src.a + dst.a - src.a * dst.a;\n" " }\n" -" else if (mode == 16) {\n" +" else if (mode == 16) { /* LIGHTEN */\n" " r.rgb = max (src.rgb * dst.a, dst.rgb * src.a)\n" " + src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a);\n" " r.a = src.a + dst.a - src.a * dst.a;\n" " }\n" -" else if (mode == 23) {\n" +" else if (mode == 23) { /* MULTIPLY (premul) */\n" " r.rgb = src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a)\n" " + src.rgb * dst.rgb;\n" " r.a = src.a + dst.a - src.a * dst.a;\n" " }\n" +" /* SRC_OVER (3) and DIFFERENCE / EXCLUSION / HSL_* (21, 22, 24-27)\n" +" * fall through to the SRC_OVER default. */\n" " return r;\n" "}\n" "\n" diff --git a/src/hb-gpu-paint-fragment-msl.hh b/src/hb-gpu-paint-fragment-msl.hh index b2e0f8752..81e25612b 100644 --- a/src/hb-gpu-paint-fragment-msl.hh +++ b/src/hb-gpu-paint-fragment-msl.hh @@ -167,37 +167,53 @@ static const char *hb_gpu_paint_fragment_msl = "{\n" " float4 r = src + dst * (1.0 - src.a); /* SRC_OVER default */\n" "\n" -" if (mode == 0) r = float4 (0.0);\n" -" else if (mode == 1) r = src;\n" -" else if (mode == 2) r = dst;\n" -" else if (mode == 4) r = dst + src * (1.0 - dst.a);\n" -" else if (mode == 5) r = src * dst.a;\n" -" else if (mode == 6) r = dst * src.a;\n" -" else if (mode == 7) r = src * (1.0 - dst.a);\n" -" else if (mode == 8) r = dst * (1.0 - src.a);\n" -" else if (mode == 9) r = src * dst.a + dst * (1.0 - src.a);\n" -" else if (mode == 10) r = dst * src.a + src * (1.0 - dst.a);\n" -" else if (mode == 11) r = src * (1.0 - dst.a) + dst * (1.0 - src.a);\n" -" else if (mode == 12) r = min (src + dst, float4 (1.0));\n" -" else if (mode == 13) {\n" +" /* Mode numbers match hb_paint_composite_mode_t. SRC_OVER (3) is\n" +" * the default `r` above. */\n" +"\n" +" /* Approximate unsupported modes with the nearest Porter-Duff mode\n" +" * we do implement. DIFFERENCE / EXCLUSION / HSL_* still fall\n" +" * through to SRC_OVER below. */\n" +" if (mode == 14 || mode == 18 || mode == 19) mode = 23; /* OVERLAY / COLOR_BURN / HARD_LIGHT -> MULTIPLY */\n" +" else if (mode == 17 || mode == 20) mode = 13; /* COLOR_DODGE / SOFT_LIGHT -> SCREEN */\n" +"\n" +" if (mode == 0) r = float4 (0.0); /* CLEAR */\n" +" else if (mode == 1) r = src; /* SRC */\n" +" else if (mode == 2) r = dst; /* DST */\n" +" else if (mode == 4) r = dst + src * (1.0 - dst.a); /* DST_OVER */\n" +" else if (mode == 5) r = src * dst.a; /* SRC_IN */\n" +" else if (mode == 6) r = dst * src.a; /* DST_IN */\n" +" else if (mode == 7) r = src * (1.0 - dst.a); /* SRC_OUT */\n" +" else if (mode == 8) r = dst * (1.0 - src.a); /* DST_OUT */\n" +" else if (mode == 9) /* SRC_ATOP */\n" +" r = src * dst.a + dst * (1.0 - src.a);\n" +" else if (mode == 10) /* DST_ATOP */\n" +" r = dst * src.a + src * (1.0 - dst.a);\n" +" else if (mode == 11) /* XOR */\n" +" r = src * (1.0 - dst.a) + dst * (1.0 - src.a);\n" +" else if (mode == 12) /* PLUS */\n" +" r = min (src + dst, float4 (1.0));\n" +" else if (mode == 13) { /* SCREEN (premul) */\n" " r.rgb = src.rgb + dst.rgb - src.rgb * dst.rgb;\n" " r.a = src.a + dst.a - src.a * dst.a;\n" " }\n" -" else if (mode == 15) {\n" +" else if (mode == 15) { /* DARKEN */\n" " r.rgb = min (src.rgb * dst.a, dst.rgb * src.a)\n" " + src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a);\n" " r.a = src.a + dst.a - src.a * dst.a;\n" " }\n" -" else if (mode == 16) {\n" +" else if (mode == 16) { /* LIGHTEN */\n" " r.rgb = max (src.rgb * dst.a, dst.rgb * src.a)\n" " + src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a);\n" " r.a = src.a + dst.a - src.a * dst.a;\n" " }\n" -" else if (mode == 23) {\n" +" else if (mode == 23) { /* MULTIPLY (premul) */\n" " r.rgb = src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a)\n" " + src.rgb * dst.rgb;\n" " r.a = src.a + dst.a - src.a * dst.a;\n" " }\n" +" /* SRC_OVER (3) and DIFFERENCE / EXCLUSION / HSL_* (21, 22, 24-27)\n" +" * fall through to the SRC_OVER default. */\n" +"\n" " return r;\n" "}\n" "\n" diff --git a/src/hb-gpu-paint-fragment-wgsl.hh b/src/hb-gpu-paint-fragment-wgsl.hh index e109fbb76..167958d1f 100644 --- a/src/hb-gpu-paint-fragment-wgsl.hh +++ b/src/hb-gpu-paint-fragment-wgsl.hh @@ -165,41 +165,51 @@ static const char *hb_gpu_paint_fragment_wgsl = " return _hb_gpu_eval_stops (hb_gpu_atlas, grad_base + 2, stop_count, t, foreground);\n" "}\n" "\n" -"fn _hb_gpu_composite (src: vec4f, dst: vec4f, mode: i32) -> vec4f\n" +"fn _hb_gpu_composite (src: vec4f, dst: vec4f, mode_in: i32) -> vec4f\n" "{\n" -" var r = src + dst * (1.0 - src.a);\n" +" var r = src + dst * (1.0 - src.a); /* SRC_OVER default */\n" "\n" -" if (mode == 0) { r = vec4f (0.0); }\n" -" else if (mode == 1) { r = src; }\n" -" else if (mode == 2) { r = dst; }\n" -" else if (mode == 4) { r = dst + src * (1.0 - dst.a); }\n" -" else if (mode == 5) { r = src * dst.a; }\n" -" else if (mode == 6) { r = dst * src.a; }\n" -" else if (mode == 7) { r = src * (1.0 - dst.a); }\n" -" else if (mode == 8) { r = dst * (1.0 - src.a); }\n" -" else if (mode == 9) { r = src * dst.a + dst * (1.0 - src.a); }\n" -" else if (mode == 10) { r = dst * src.a + src * (1.0 - dst.a); }\n" -" else if (mode == 11) { r = src * (1.0 - dst.a) + dst * (1.0 - src.a); }\n" -" else if (mode == 12) { r = min (src + dst, vec4f (1.0)); }\n" -" else if (mode == 13) {\n" +" /* Mode numbers match hb_paint_composite_mode_t. Approximate\n" +" * unsupported modes with the nearest Porter-Duff mode we do\n" +" * implement; DIFFERENCE / EXCLUSION / HSL_* still fall through to\n" +" * SRC_OVER below. */\n" +" var mode = mode_in;\n" +" if (mode == 14 || mode == 18 || mode == 19) { mode = 23; } /* OVERLAY / COLOR_BURN / HARD_LIGHT -> MULTIPLY */\n" +" else if (mode == 17 || mode == 20) { mode = 13; } /* COLOR_DODGE / SOFT_LIGHT -> SCREEN */\n" +"\n" +" if (mode == 0) { r = vec4f (0.0); } /* CLEAR */\n" +" else if (mode == 1) { r = src; } /* SRC */\n" +" else if (mode == 2) { r = dst; } /* DST */\n" +" else if (mode == 4) { r = dst + src * (1.0 - dst.a); } /* DST_OVER */\n" +" else if (mode == 5) { r = src * dst.a; } /* SRC_IN */\n" +" else if (mode == 6) { r = dst * src.a; } /* DST_IN */\n" +" else if (mode == 7) { r = src * (1.0 - dst.a); } /* SRC_OUT */\n" +" else if (mode == 8) { r = dst * (1.0 - src.a); } /* DST_OUT */\n" +" else if (mode == 9) { r = src * dst.a + dst * (1.0 - src.a); } /* SRC_ATOP */\n" +" else if (mode == 10) { r = dst * src.a + src * (1.0 - dst.a); } /* DST_ATOP */\n" +" else if (mode == 11) { r = src * (1.0 - dst.a) + dst * (1.0 - src.a); } /* XOR */\n" +" else if (mode == 12) { r = min (src + dst, vec4f (1.0)); } /* PLUS */\n" +" else if (mode == 13) { /* SCREEN (premul) */\n" " r = vec4f (src.rgb + dst.rgb - src.rgb * dst.rgb,\n" " src.a + dst.a - src.a * dst.a);\n" " }\n" -" else if (mode == 15) {\n" +" else if (mode == 15) { /* DARKEN */\n" " r = vec4f (min (src.rgb * dst.a, dst.rgb * src.a)\n" " + src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a),\n" " src.a + dst.a - src.a * dst.a);\n" " }\n" -" else if (mode == 16) {\n" +" else if (mode == 16) { /* LIGHTEN */\n" " r = vec4f (max (src.rgb * dst.a, dst.rgb * src.a)\n" " + src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a),\n" " src.a + dst.a - src.a * dst.a);\n" " }\n" -" else if (mode == 23) {\n" +" else if (mode == 23) { /* MULTIPLY (premul) */\n" " r = vec4f (src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a)\n" " + src.rgb * dst.rgb,\n" " src.a + dst.a - src.a * dst.a);\n" " }\n" +" /* SRC_OVER (3) and DIFFERENCE / EXCLUSION / HSL_* (21, 22, 24-27)\n" +" * fall through to the SRC_OVER default. */\n" " return r;\n" "}\n" "\n" diff --git a/src/hb-gpu-paint-fragment.glsl b/src/hb-gpu-paint-fragment.glsl index 8233694d1..f2f00b579 100644 --- a/src/hb-gpu-paint-fragment.glsl +++ b/src/hb-gpu-paint-fragment.glsl @@ -193,6 +193,14 @@ vec4 _hb_gpu_composite (vec4 src, vec4 dst, int mode) { vec4 r = src + dst * (1.0 - src.a); /* SRC_OVER default */ + /* Approximate unsupported COLRv1 modes with the nearest Porter-Duff + * mode we do implement. Better a recognizable rendering than a + * silent SRC_OVER fallback. DIFFERENCE / EXCLUSION / HSL_* are + * not similar enough to anything we have, so they still fall + * through to SRC_OVER below. */ + if (mode == 14 || mode == 18 || mode == 19) mode = 23; /* OVERLAY / COLOR_BURN / HARD_LIGHT -> MULTIPLY */ + else if (mode == 17 || mode == 20) mode = 13; /* COLOR_DODGE / SOFT_LIGHT -> SCREEN */ + if (mode == 0) r = vec4 (0.0); /* CLEAR */ else if (mode == 1) r = src; /* SRC */ else if (mode == 2) r = dst; /* DST */ @@ -228,7 +236,8 @@ vec4 _hb_gpu_composite (vec4 src, vec4 dst, int mode) + src.rgb * dst.rgb; r.a = src.a + dst.a - src.a * dst.a; } - /* SRC_OVER (3) and any unsupported mode use the default `r`. */ + /* SRC_OVER (3) and DIFFERENCE / EXCLUSION / HSL_* (21, 22, 24-27) + * fall through to the SRC_OVER default. */ return r; } diff --git a/src/hb-gpu-paint-fragment.hlsl b/src/hb-gpu-paint-fragment.hlsl index 02c29a243..0924b4c14 100644 --- a/src/hb-gpu-paint-fragment.hlsl +++ b/src/hb-gpu-paint-fragment.hlsl @@ -154,39 +154,48 @@ float4 _hb_gpu_sample_sweep (float2 renderCoord, int grad_base, float4 _hb_gpu_composite (float4 src, float4 dst, int mode) { - float4 r = src + dst * (1.0 - src.a); + float4 r = src + dst * (1.0 - src.a); /* SRC_OVER default */ - if (mode == 0) r = float4 (0.0, 0.0, 0.0, 0.0); - else if (mode == 1) r = src; - else if (mode == 2) r = dst; - else if (mode == 4) r = dst + src * (1.0 - dst.a); - else if (mode == 5) r = src * dst.a; - else if (mode == 6) r = dst * src.a; - else if (mode == 7) r = src * (1.0 - dst.a); - else if (mode == 8) r = dst * (1.0 - src.a); - else if (mode == 9) r = src * dst.a + dst * (1.0 - src.a); - else if (mode == 10) r = dst * src.a + src * (1.0 - dst.a); - else if (mode == 11) r = src * (1.0 - dst.a) + dst * (1.0 - src.a); - else if (mode == 12) r = min (src + dst, float4 (1.0, 1.0, 1.0, 1.0)); - else if (mode == 13) { + /* Mode numbers match hb_paint_composite_mode_t. Approximate + * unsupported modes with the nearest Porter-Duff mode we do + * implement; DIFFERENCE / EXCLUSION / HSL_* still fall through to + * SRC_OVER below. */ + if (mode == 14 || mode == 18 || mode == 19) mode = 23; /* OVERLAY / COLOR_BURN / HARD_LIGHT -> MULTIPLY */ + else if (mode == 17 || mode == 20) mode = 13; /* COLOR_DODGE / SOFT_LIGHT -> SCREEN */ + + if (mode == 0) r = float4 (0.0, 0.0, 0.0, 0.0); /* CLEAR */ + else if (mode == 1) r = src; /* SRC */ + else if (mode == 2) r = dst; /* DST */ + else if (mode == 4) r = dst + src * (1.0 - dst.a); /* DST_OVER */ + else if (mode == 5) r = src * dst.a; /* SRC_IN */ + else if (mode == 6) r = dst * src.a; /* DST_IN */ + else if (mode == 7) r = src * (1.0 - dst.a); /* SRC_OUT */ + else if (mode == 8) r = dst * (1.0 - src.a); /* DST_OUT */ + else if (mode == 9) r = src * dst.a + dst * (1.0 - src.a); /* SRC_ATOP */ + else if (mode == 10) r = dst * src.a + src * (1.0 - dst.a); /* DST_ATOP */ + else if (mode == 11) r = src * (1.0 - dst.a) + dst * (1.0 - src.a); /* XOR */ + else if (mode == 12) r = min (src + dst, float4 (1.0, 1.0, 1.0, 1.0)); /* PLUS */ + else if (mode == 13) { /* SCREEN (premul) */ r.rgb = src.rgb + dst.rgb - src.rgb * dst.rgb; r.a = src.a + dst.a - src.a * dst.a; } - else if (mode == 15) { + else if (mode == 15) { /* DARKEN */ r.rgb = min (src.rgb * dst.a, dst.rgb * src.a) + src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a); r.a = src.a + dst.a - src.a * dst.a; } - else if (mode == 16) { + else if (mode == 16) { /* LIGHTEN */ r.rgb = max (src.rgb * dst.a, dst.rgb * src.a) + src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a); r.a = src.a + dst.a - src.a * dst.a; } - else if (mode == 23) { + else if (mode == 23) { /* MULTIPLY (premul) */ r.rgb = src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a) + src.rgb * dst.rgb; r.a = src.a + dst.a - src.a * dst.a; } + /* SRC_OVER (3) and DIFFERENCE / EXCLUSION / HSL_* (21, 22, 24-27) + * fall through to the SRC_OVER default. */ return r; } diff --git a/src/hb-gpu-paint-fragment.msl b/src/hb-gpu-paint-fragment.msl index f567f5354..0329d4b8d 100644 --- a/src/hb-gpu-paint-fragment.msl +++ b/src/hb-gpu-paint-fragment.msl @@ -166,37 +166,53 @@ static float4 _hb_gpu_composite (float4 src, float4 dst, int mode) { float4 r = src + dst * (1.0 - src.a); /* SRC_OVER default */ - if (mode == 0) r = float4 (0.0); - else if (mode == 1) r = src; - else if (mode == 2) r = dst; - else if (mode == 4) r = dst + src * (1.0 - dst.a); - else if (mode == 5) r = src * dst.a; - else if (mode == 6) r = dst * src.a; - else if (mode == 7) r = src * (1.0 - dst.a); - else if (mode == 8) r = dst * (1.0 - src.a); - else if (mode == 9) r = src * dst.a + dst * (1.0 - src.a); - else if (mode == 10) r = dst * src.a + src * (1.0 - dst.a); - else if (mode == 11) r = src * (1.0 - dst.a) + dst * (1.0 - src.a); - else if (mode == 12) r = min (src + dst, float4 (1.0)); - else if (mode == 13) { + /* Mode numbers match hb_paint_composite_mode_t. SRC_OVER (3) is + * the default `r` above. */ + + /* Approximate unsupported modes with the nearest Porter-Duff mode + * we do implement. DIFFERENCE / EXCLUSION / HSL_* still fall + * through to SRC_OVER below. */ + if (mode == 14 || mode == 18 || mode == 19) mode = 23; /* OVERLAY / COLOR_BURN / HARD_LIGHT -> MULTIPLY */ + else if (mode == 17 || mode == 20) mode = 13; /* COLOR_DODGE / SOFT_LIGHT -> SCREEN */ + + if (mode == 0) r = float4 (0.0); /* CLEAR */ + else if (mode == 1) r = src; /* SRC */ + else if (mode == 2) r = dst; /* DST */ + else if (mode == 4) r = dst + src * (1.0 - dst.a); /* DST_OVER */ + else if (mode == 5) r = src * dst.a; /* SRC_IN */ + else if (mode == 6) r = dst * src.a; /* DST_IN */ + else if (mode == 7) r = src * (1.0 - dst.a); /* SRC_OUT */ + else if (mode == 8) r = dst * (1.0 - src.a); /* DST_OUT */ + else if (mode == 9) /* SRC_ATOP */ + r = src * dst.a + dst * (1.0 - src.a); + else if (mode == 10) /* DST_ATOP */ + r = dst * src.a + src * (1.0 - dst.a); + else if (mode == 11) /* XOR */ + r = src * (1.0 - dst.a) + dst * (1.0 - src.a); + else if (mode == 12) /* PLUS */ + r = min (src + dst, float4 (1.0)); + else if (mode == 13) { /* SCREEN (premul) */ r.rgb = src.rgb + dst.rgb - src.rgb * dst.rgb; r.a = src.a + dst.a - src.a * dst.a; } - else if (mode == 15) { + else if (mode == 15) { /* DARKEN */ r.rgb = min (src.rgb * dst.a, dst.rgb * src.a) + src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a); r.a = src.a + dst.a - src.a * dst.a; } - else if (mode == 16) { + else if (mode == 16) { /* LIGHTEN */ r.rgb = max (src.rgb * dst.a, dst.rgb * src.a) + src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a); r.a = src.a + dst.a - src.a * dst.a; } - else if (mode == 23) { + else if (mode == 23) { /* MULTIPLY (premul) */ r.rgb = src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a) + src.rgb * dst.rgb; r.a = src.a + dst.a - src.a * dst.a; } + /* SRC_OVER (3) and DIFFERENCE / EXCLUSION / HSL_* (21, 22, 24-27) + * fall through to the SRC_OVER default. */ + return r; } diff --git a/src/hb-gpu-paint-fragment.wgsl b/src/hb-gpu-paint-fragment.wgsl index d1954bee0..0d6d7070d 100644 --- a/src/hb-gpu-paint-fragment.wgsl +++ b/src/hb-gpu-paint-fragment.wgsl @@ -164,41 +164,51 @@ fn _hb_gpu_sample_sweep (renderCoord: vec2f, grad_base: i32, return _hb_gpu_eval_stops (hb_gpu_atlas, grad_base + 2, stop_count, t, foreground); } -fn _hb_gpu_composite (src: vec4f, dst: vec4f, mode: i32) -> vec4f +fn _hb_gpu_composite (src: vec4f, dst: vec4f, mode_in: i32) -> vec4f { - var r = src + dst * (1.0 - src.a); + var r = src + dst * (1.0 - src.a); /* SRC_OVER default */ - if (mode == 0) { r = vec4f (0.0); } - else if (mode == 1) { r = src; } - else if (mode == 2) { r = dst; } - else if (mode == 4) { r = dst + src * (1.0 - dst.a); } - else if (mode == 5) { r = src * dst.a; } - else if (mode == 6) { r = dst * src.a; } - else if (mode == 7) { r = src * (1.0 - dst.a); } - else if (mode == 8) { r = dst * (1.0 - src.a); } - else if (mode == 9) { r = src * dst.a + dst * (1.0 - src.a); } - else if (mode == 10) { r = dst * src.a + src * (1.0 - dst.a); } - else if (mode == 11) { r = src * (1.0 - dst.a) + dst * (1.0 - src.a); } - else if (mode == 12) { r = min (src + dst, vec4f (1.0)); } - else if (mode == 13) { + /* Mode numbers match hb_paint_composite_mode_t. Approximate + * unsupported modes with the nearest Porter-Duff mode we do + * implement; DIFFERENCE / EXCLUSION / HSL_* still fall through to + * SRC_OVER below. */ + var mode = mode_in; + if (mode == 14 || mode == 18 || mode == 19) { mode = 23; } /* OVERLAY / COLOR_BURN / HARD_LIGHT -> MULTIPLY */ + else if (mode == 17 || mode == 20) { mode = 13; } /* COLOR_DODGE / SOFT_LIGHT -> SCREEN */ + + if (mode == 0) { r = vec4f (0.0); } /* CLEAR */ + else if (mode == 1) { r = src; } /* SRC */ + else if (mode == 2) { r = dst; } /* DST */ + else if (mode == 4) { r = dst + src * (1.0 - dst.a); } /* DST_OVER */ + else if (mode == 5) { r = src * dst.a; } /* SRC_IN */ + else if (mode == 6) { r = dst * src.a; } /* DST_IN */ + else if (mode == 7) { r = src * (1.0 - dst.a); } /* SRC_OUT */ + else if (mode == 8) { r = dst * (1.0 - src.a); } /* DST_OUT */ + else if (mode == 9) { r = src * dst.a + dst * (1.0 - src.a); } /* SRC_ATOP */ + else if (mode == 10) { r = dst * src.a + src * (1.0 - dst.a); } /* DST_ATOP */ + else if (mode == 11) { r = src * (1.0 - dst.a) + dst * (1.0 - src.a); } /* XOR */ + else if (mode == 12) { r = min (src + dst, vec4f (1.0)); } /* PLUS */ + else if (mode == 13) { /* SCREEN (premul) */ r = vec4f (src.rgb + dst.rgb - src.rgb * dst.rgb, src.a + dst.a - src.a * dst.a); } - else if (mode == 15) { + else if (mode == 15) { /* DARKEN */ r = vec4f (min (src.rgb * dst.a, dst.rgb * src.a) + src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a), src.a + dst.a - src.a * dst.a); } - else if (mode == 16) { + else if (mode == 16) { /* LIGHTEN */ r = vec4f (max (src.rgb * dst.a, dst.rgb * src.a) + src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a), src.a + dst.a - src.a * dst.a); } - else if (mode == 23) { + else if (mode == 23) { /* MULTIPLY (premul) */ r = vec4f (src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a) + src.rgb * dst.rgb, src.a + dst.a - src.a * dst.a); } + /* SRC_OVER (3) and DIFFERENCE / EXCLUSION / HSL_* (21, 22, 24-27) + * fall through to the SRC_OVER default. */ return r; }