KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: Use sRGB LUT for borders

Browse Source
This commit is contained in:
Martin Wernstål 2023-01-23 19:23:25 +01:00
parent 2bc03852a1
commit b10c18b8fe
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kitty/border_vertex.glsl
View File

@ -3,6 +3,7 @@ uniform uvec2 viewport;
uniform uint colors[9]; uniform uint colors[9];
uniform float background_opacity; uniform float background_opacity;
uniform float tint_opacity, tint_premult; uniform float tint_opacity, tint_premult;
uniform float gamma_lut[256];
in vec4 rect; // left, top, right, bottom in vec4 rect; // left, top, right, bottom
in uint rect_color; in uint rect_color;
out vec4 color; out vec4 color;
@ -22,7 +23,7 @@ const uvec2 pos_map[] = uvec2[4](
); );
float to_color(uint c) { float to_color(uint c) {
return float(c & FF) / 255.0; return gamma_lut[c & FF];
} }
float is_integer_value(uint c, float x) { float is_integer_value(uint c, float x) {

4
kitty/shaders.c
View File

@ -973,7 +973,7 @@ draw_cells(ssize_t vao_idx, ssize_t gvao_idx, const ScreenRenderData *srd, float
// }}} // }}}
// Borders {{{ // Borders {{{
enum BorderUniforms { BORDER_viewport, BORDER_background_opacity, BORDER_tint_opacity, BORDER_tint_premult, BORDER_colors, NUM_BORDER_UNIFORMS }; enum BorderUniforms { BORDER_viewport, BORDER_background_opacity, BORDER_tint_opacity, BORDER_tint_premult, BORDER_colors, BORDER_gamma_lut, NUM_BORDER_UNIFORMS };
static GLint border_uniform_locations[NUM_BORDER_UNIFORMS] = {0}; static GLint border_uniform_locations[NUM_BORDER_UNIFORMS] = {0};
static void static void
@ -984,6 +984,7 @@ init_borders_program(void) {
SET_LOC(tint_opacity) SET_LOC(tint_opacity)
SET_LOC(tint_premult) SET_LOC(tint_premult)
SET_LOC(colors) SET_LOC(colors)
SET_LOC(gamma_lut)
#undef SET_LOC #undef SET_LOC
} }
@ -1035,6 +1036,7 @@ draw_borders(ssize_t vao_idx, unsigned int num_border_rects, BorderRect *rect_bu
glUniform1f(border_uniform_locations[BORDER_tint_opacity], tint_opacity); glUniform1f(border_uniform_locations[BORDER_tint_opacity], tint_opacity);
glUniform1f(border_uniform_locations[BORDER_tint_premult], tint_premult); glUniform1f(border_uniform_locations[BORDER_tint_premult], tint_premult);
glUniform2ui(border_uniform_locations[BORDER_viewport], viewport_width, viewport_height); glUniform2ui(border_uniform_locations[BORDER_viewport], viewport_width, viewport_height);
glUniform1fv(border_uniform_locations[BORDER_gamma_lut], 256, srgb_lut);
if (has_bgimage(w)) { if (has_bgimage(w)) {
if (w->is_semi_transparent) { BLEND_PREMULT; } if (w->is_semi_transparent) { BLEND_PREMULT; }
else { BLEND_ONTO_OPAQUE_WITH_OPAQUE_OUTPUT; } else { BLEND_ONTO_OPAQUE_WITH_OPAQUE_OUTPUT; }