From 1246032b67270f03fefbaf771ac9f69caf120eff Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 12 Sep 2017 06:40:37 +0530 Subject: [PATCH] Remove unused code --- kitty/shaders.c | 2 +- kitty/shaders.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/kitty/shaders.c b/kitty/shaders.c index 9e4f859f0..3a9e7496e 100644 --- a/kitty/shaders.c +++ b/kitty/shaders.c @@ -466,7 +466,7 @@ draw_cells(ssize_t vao_idx, GLfloat xstart, GLfloat ystart, GLfloat dx, GLfloat glUniform4ui(UL(default_colors), COLOR(default_fg), COLOR(default_bg), COLOR(highlight_fg), COLOR(highlight_bg)); check_gl(); #undef COLOR - glUniform1i(UL(sprites), 0); + glUniform1i(UL(sprites), 0); // the sprite map is bound to GL_TEXTURE0 check_gl(); unsigned int x, y, z; sprite_map_current_layout(&x, &y, &z); diff --git a/kitty/shaders.py b/kitty/shaders.py index cdb9c2926..650c5a41e 100644 --- a/kitty/shaders.py +++ b/kitty/shaders.py @@ -29,14 +29,11 @@ class Sprites: def __init__(self): self.xnum = self.ynum = 1 - self.first_cell_cache = {} - self.second_cell_cache = {} self.x = self.y = self.z = 0 self.texture_id = None self.last_num_of_layers = 1 self.last_ynum = -1 - self.sampler_num = 0 - self.texture_unit = GL_TEXTURE0 + self.sampler_num + self.texture_unit = GL_TEXTURE0 sprite_map_set_limits(glGetIntegerv(GL_MAX_TEXTURE_SIZE), glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS)) def do_layout(self, cell_width=1, cell_height=1):