git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-07-13 10:06:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wg_engine: corrected tint/tritone wrong alpha multiplication
Some checks are pending
Android / build_x86_64 (push) Waiting to run
Details
Android / build_aarch64 (push) Waiting to run
Details
iOS / build_x86_64 (push) Waiting to run
Details
iOS / build_arm64 (push) Waiting to run
Details
macOS / build (push) Waiting to run
Details
macOS / compact_test (push) Waiting to run
Details
macOS / unit_test (push) Waiting to run
Details
Ubuntu / build (push) Waiting to run
Details
Ubuntu / compact_test (push) Waiting to run
Details
Ubuntu / unit_test (push) Waiting to run
Details
Windows / build (push) Waiting to run
Details
Windows / compact_test (push) Waiting to run
Details
Windows / unit_test (push) Waiting to run
Details

Browse source
This commit is contained in:
Hermet Park 2025-07-08 21:37:41 +09:00 • committed by Hermet Park
parent 668c818240
commit 7e0f394c2c
1 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/renderer/wg_engine/tvgWgShaderSrc.cpp
View file

@ -844,44 +844,28 @@ fn cs_main_fill(@builtin(global_invocation_id) gid: vec3u) {
@compute @workgroup_size(128, 1) @compute @workgroup_size(128, 1)
fn cs_main_tint(@builtin(global_invocation_id) gid: vec3u) { fn cs_main_tint(@builtin(global_invocation_id) gid: vec3u) {
// decode viewport and settings
let vmin = vec2u(viewport.xy); let vmin = vec2u(viewport.xy);
let vmax = vec2u(viewport.zw); let vmax = vec2u(viewport.zw);
// tex coord
let uid = min(gid.xy + vmin, vmax); let uid = min(gid.xy + vmin, vmax);
let orig = textureLoad(imageSrc, uid, 0); let orig = textureLoad(imageSrc, uid, 0);
let luma: f32 = dot(orig.rgb, vec3f(0.2126, 0.7152, 0.0722)); let luma: f32 = dot(orig.rgb, vec3f(0.2126, 0.7152, 0.0722));
let black = settings[0]; let color = vec4f(mix(orig.rgb, mix(settings[0].rgb, settings[1].rgb, luma), settings[2].r) * orig.a, orig.a);
let white = settings[1];
let intens = settings[2].r;
let color = mix(orig, mix(black, white, luma), intens) * orig.a;
textureStore(imageTrg, uid.xy, color); textureStore(imageTrg, uid.xy, color);
} }
@compute @workgroup_size(128, 1) @compute @workgroup_size(128, 1)
fn cs_main_tritone(@builtin(global_invocation_id) gid: vec3u) { fn cs_main_tritone(@builtin(global_invocation_id) gid: vec3u) {
// decode viewport and settings
let vmin = vec2u(viewport.xy); let vmin = vec2u(viewport.xy);
let vmax = vec2u(viewport.zw); let vmax = vec2u(viewport.zw);
// tex coord
let uid = min(gid.xy + vmin, vmax); let uid = min(gid.xy + vmin, vmax);
let orig = textureLoad(imageSrc, uid, 0); let orig = textureLoad(imageSrc, uid, 0);
let luma: f32 = dot(orig.rgb, vec3f(0.2126, 0.7152, 0.0722)); let luma: f32 = dot(orig.rgb, vec3f(0.2126, 0.7152, 0.0722));
let shadow = settings[0]; let is_bright: bool = luma >= 0.5f;
let midtone = settings[1]; let t = select(luma * 2.0f, (luma - 0.5) * 2.0f, is_bright);
let highlight = settings[2]; var tmp = vec4f(mix(select(settings[0].rgb, settings[1].rgb, is_bright), select(settings[1].rgb, settings[2].rgb, is_bright), t), 1.0f);
if (settings[2].a > 0.0f) {
var color = select(mix(shadow, midtone, luma * 2.0f), mix(midtone, highlight, (luma - 0.5f)*2.0f), luma >= 0.5f); tmp = mix(tmp, orig, settings[2].a);
// blending
if (highlight.a > 0.0f) {
color = mix(color, orig, highlight.a);
} }
textureStore(imageTrg, uid.xy, tmp * orig.a);
textureStore(imageTrg, uid.xy, color * orig.a);
} }
)"; )";