mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-28 03:01:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Speed up rendering in the case of transparent window + non-underlaid images

Browse Source 
Do single pass rendering for these as well.
This commit is contained in:
Kovid Goyal
2023-06-23 16:26:36 +05:30
parent 1798c52f77
commit eb2196633b
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kitty/cell_fragment.glsl
View File

@@ -45,9 +45,9 @@ vec4 vec4_premul(vec4 rgba) {
* are images that are below the foreground. Single pass rendering has PHASE=PHASE_BOTH. Otherwise, there * are images that are below the foreground. Single pass rendering has PHASE=PHASE_BOTH. Otherwise, there
* are three passes, PHASE=PHASE_BACKGROUND, PHASE=PHASE_SPECIAL, PHASE=PHASE_FOREGROUND. * are three passes, PHASE=PHASE_BACKGROUND, PHASE=PHASE_SPECIAL, PHASE=PHASE_FOREGROUND.
* 1) Single pass -- this path is used when there are either no images, or all images are * 1) Single pass -- this path is used when there are either no images, or all images are
* drawn on top of text and the background is opaque. In this case, there is a single pass, * drawn on top of text. In this case, there is a single pass,
* of this shader with cell foreground and background colors blended directly. * of this shader with cell foreground and background colors blended directly.
* Expected output is a color premultiplied by alpha, with an alpha specified as well. * Expected output is either opaque colors or pre-multiplied colors.
* *
* 2) Interleaved -- this path is used if background is not opaque and there are images or * 2) Interleaved -- this path is used if background is not opaque and there are images or
* if the background is opaque but there are images under text. Rendering happens in * if the background is opaque but there are images under text. Rendering happens in

18
kitty/shaders.c
View File

@@ -550,13 +550,14 @@ viewport_for_cells(const CellRenderData *crd) {
} }
static void static void
draw_cells_simple(ssize_t vao_idx, Screen *screen, const CellRenderData *crd) { draw_cells_simple(ssize_t vao_idx, Screen *screen, const CellRenderData *crd, bool is_semi_transparent) {
bind_program(CELL_PROGRAM); bind_program(CELL_PROGRAM);
glDrawArraysInstanced(GL_TRIANGLE_FAN, 0, 4, screen->lines * screen->columns); glDrawArraysInstanced(GL_TRIANGLE_FAN, 0, 4, screen->lines * screen->columns);
if (screen->grman->count) { if (screen->grman->count) {
glEnable(GL_BLEND); glEnable(GL_BLEND);
BLEND_ONTO_OPAQUE; int program = GRAPHICS_PROGRAM;
draw_graphics(GRAPHICS_PROGRAM, vao_idx, screen->grman->render_data, 0, screen->grman->count, viewport_for_cells(crd)); if (is_semi_transparent) { BLEND_PREMULT; program = GRAPHICS_PREMULT_PROGRAM; } else { BLEND_ONTO_OPAQUE; }
draw_graphics(program, vao_idx, screen->grman->render_data, 0, screen->grman->count, viewport_for_cells(crd));
glDisable(GL_BLEND); glDisable(GL_BLEND);
} }
} }
@@ -955,14 +956,13 @@ draw_cells(ssize_t vao_idx, const ScreenRenderData *srd, OSWindow *os_window, bo
scale_rendered_graphic(screen->grman->render_data + i, srd->xstart, srd->ystart, crd.x_ratio, crd.y_ratio); scale_rendered_graphic(screen->grman->render_data + i, srd->xstart, srd->ystart, crd.x_ratio, crd.y_ratio);
} }
} }
has_underlying_image |= screen->grman->num_of_below_refs > 0 || screen->grman->num_of_negative_refs > 0;
if (os_window->is_semi_transparent) { if (os_window->is_semi_transparent) {
if (screen->grman->count || has_underlying_image) draw_cells_interleaved_premult( if (has_underlying_image) draw_cells_interleaved_premult(vao_idx, screen, os_window, &crd, wl);
vao_idx, screen, os_window, &crd, wl); else draw_cells_simple(vao_idx, screen, &crd, os_window->is_semi_transparent);
else draw_cells_simple(vao_idx, screen, &crd);
} else { } else {
if (screen->grman->num_of_negative_refs || screen->grman->num_of_below_refs || has_underlying_image) draw_cells_interleaved( if (has_underlying_image) draw_cells_interleaved(vao_idx, screen, os_window, &crd, wl);
vao_idx, screen, os_window, &crd, wl); else draw_cells_simple(vao_idx, screen, &crd, os_window->is_semi_transparent);
else draw_cells_simple(vao_idx, screen, &crd);
} }
if (screen->start_visual_bell_at) { if (screen->start_visual_bell_at) {