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

Another fix to the scissor for rendering the cell area

Browse Source 
With a cyan background it becomes apparent that the width/height are one
pixel too small
This commit is contained in:
Kovid Goyal 2019-06-12 10:37:20 +05:30
parent a5aca35f1c
commit 15e8f6ad8a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kitty/shaders.c
View File

@ -506,14 +506,15 @@ draw_cells(ssize_t vao_idx, ssize_t gvao_idx, GLfloat xstart, GLfloat ystart, GL
set_cell_uniforms(current_inactive_text_alpha); set_cell_uniforms(current_inactive_text_alpha);
GLfloat w = (GLfloat)screen->columns * dx, h = (GLfloat)screen->lines * dy; GLfloat w = (GLfloat)screen->columns * dx, h = (GLfloat)screen->lines * dy;
// The scissor limits below are calculated to ensure that they do not // The scissor limits below are calculated to ensure that they do not
// overlap with the pixels outside the draw area, see https://github.com/kovidgoyal/kitty/issues/741 // overlap with the pixels outside the draw area,
// for a test case (the scissor is also used by draw_cells_interleaved_premult to blit the framebuffer) // for a test case (scissor is also used to blit framebuffer in draw_cells_interleaved_premult) run:
// kitty -o background=cyan -o background_opacity=0.7 -o window_margin_width=40 sh -c "kitty +kitten icat logo/kitty.png; read"
#define SCALE(w, x) ((GLfloat)(os_window->viewport_##w) * (GLfloat)(x)) #define SCALE(w, x) ((GLfloat)(os_window->viewport_##w) * (GLfloat)(x))
glScissor( glScissor(
(GLint)(ceilf(SCALE(width, (xstart + 1.0f) / 2.0f))), (GLint)(ceilf(SCALE(width, (xstart + 1.0f) / 2.0f))), // x
(GLint)(ceilf(SCALE(height, ((ystart - h) + 1.0f) / 2.0f))), (GLint)(ceilf(SCALE(height, ((ystart - h) + 1.0f) / 2.0f))), // y
(GLsizei)(floorf(SCALE(width, w / 2.0f))-1), (GLsizei)(floorf(SCALE(width, w / 2.0f))), // width
(GLsizei)(floorf(SCALE(height, h / 2.0f))-1) (GLsizei)(floorf(SCALE(height, h / 2.0f))) // height
); );
#undef SCALE #undef SCALE
if (os_window->is_semi_transparent) { if (os_window->is_semi_transparent) {