From 96a9d64bcb76a2739c5b1f969bfddbae2831b140 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 4 Oct 2017 15:34:54 +0530 Subject: [PATCH] A spot of refactoring --- kitty/shaders.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/kitty/shaders.c b/kitty/shaders.c index 3f0d9f92c..c166e7565 100644 --- a/kitty/shaders.c +++ b/kitty/shaders.c @@ -285,10 +285,8 @@ cell_prepare_to_render(ssize_t vao_idx, Screen *screen, GLfloat xstart, GLfloat bind_vertex_array(vao_idx); } -static void -draw_cells_impl(ssize_t vao_idx, GLfloat xstart, GLfloat ystart, GLfloat dx, GLfloat dy, Screen *screen, CursorRenderInfo *cursor) { - cell_prepare_to_render(vao_idx, screen, xstart, ystart, dx, dy, cursor); - +static void +draw_all_cells(Screen *screen) { bind_program(CELL_PROGRAM); static bool cell_constants_set = false; if (!cell_constants_set) { @@ -297,6 +295,13 @@ draw_cells_impl(ssize_t vao_idx, GLfloat xstart, GLfloat ystart, GLfloat dx, GLf } glDrawArraysInstanced(GL_TRIANGLE_FAN, 0, 4, screen->lines * screen->columns); check_gl(); } + +static void +draw_cells_impl(ssize_t vao_idx, GLfloat xstart, GLfloat ystart, GLfloat dx, GLfloat dy, Screen *screen, CursorRenderInfo *cursor) { + cell_prepare_to_render(vao_idx, screen, xstart, ystart, dx, dy, cursor); + draw_all_cells(screen); + +} // }}} // Cursor {{{