nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 08:32:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

vulkan: perform sRGB-to-linear conversion correctly for premultiplied values

Browse Source 
Pre-multipled sRGB values need to be un-multiplied before conversion
to linear and then re-multiplied after. Compare shaders/texture.frag.

This fixes an issue in labwc where titlebar corners (rendered as
ARGB textures) did not match the rest of the titlebar (rendered as
a solid wlr_scene_rect).

Note: 0.17 has other instances in render/vulkan/renderer.c that need
the same fix.
This commit is contained in:
John Lindgren 2024-04-07 02:00:14 -04:00 committed by Simon Ser
parent 73d2fd4d4f
commit b1b34cd665
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
render/vulkan/pass.c
View File

@ -48,6 +48,10 @@ static float color_to_linear(float non_linear) {
non_linear / 12.92; non_linear / 12.92;
} }
static float color_to_linear_premult(float non_linear, float alpha) {
return (alpha == 0) ? 0 : color_to_linear(non_linear / alpha) * alpha;
}
static void mat3_to_mat4(const float mat3[9], float mat4[4][4]) { static void mat3_to_mat4(const float mat3[9], float mat4[4][4]) {
memset(mat4, 0, sizeof(float) * 16); memset(mat4, 0, sizeof(float) * 16);
mat4[0][0] = mat3[0]; mat4[0][0] = mat3[0];
@ -443,9 +447,9 @@ static void render_pass_add_rect(struct wlr_render_pass *wlr_pass,
// colors in linear space as well (and vulkan then automatically // colors in linear space as well (and vulkan then automatically
// does the conversion for out sRGB render targets). // does the conversion for out sRGB render targets).
float linear_color[] = { float linear_color[] = {
color_to_linear(options->color.r), color_to_linear_premult(options->color.r, options->color.a),
color_to_linear(options->color.g), color_to_linear_premult(options->color.g, options->color.a),
color_to_linear(options->color.b), color_to_linear_premult(options->color.b, options->color.a),
options->color.a, // no conversion for alpha options->color.a, // no conversion for alpha
}; };