mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 22:28:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid unnecessary calls to glBindTexture

Browse Source
This commit is contained in:
Kovid Goyal
2017-09-30 07:00:46 +05:30
parent 8d03d7216f
commit 55498b5a44
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kitty/shaders.c
View File

@@ -466,18 +466,17 @@ render_cell(PyObject *text, bool bold, bool italic, unsigned int underline, bool
#undef B
}
#define SPRITE_MAP_UNIT 0
enum {SPRITE_MAP_UNIT};
static inline void
bind_sprite_map() {
ensure_sprite_map() {
static GLuint bound_texture_id = 0;
if (!sprite_map.texture_id) realloc_sprite_texture();
glActiveTexture(GL_TEXTURE0 + SPRITE_MAP_UNIT); check_gl();
glBindTexture(GL_TEXTURE_2D_ARRAY, sprite_map.texture_id); check_gl();
}
static inline void
unbind_sprite_map() {
glBindTexture(GL_TEXTURE_2D_ARRAY, 0); check_gl();
if (bound_texture_id != sprite_map.texture_id) {
glActiveTexture(GL_TEXTURE0 + SPRITE_MAP_UNIT); check_gl();
glBindTexture(GL_TEXTURE_2D_ARRAY, sprite_map.texture_id); check_gl();
bound_texture_id = sprite_map.texture_id;
}
}
static void
@@ -624,7 +623,7 @@ draw_cells_impl(ssize_t vao_idx, GLfloat xstart, GLfloat ystart, GLfloat dx, GLf
}
index_type cx = screen->columns, cy = screen->lines;
if (cursor->is_visible && cursor->shape == CURSOR_BLOCK) { cx = screen->cursor->x, cy = screen->cursor->y; }
bind_sprite_map();
ensure_sprite_map();
render_dirty_sprites(render_and_send_dirty_sprites);
#define UL(name) cell_uniform_locations[CELL_##name]
bind_program(CELL_PROGRAM);
@@ -650,7 +649,6 @@ 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();
unbind_vertex_array();
unbind_program();
unbind_sprite_map();
#undef UL
}
// }}}