CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-10-22 05:02:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix sprites uniform not being initialized when using layered rendering

Browse source 
Had no actual bad effects since it is initialized to zero anyway
This commit is contained in:
Kovid Goyal 2017-11-21 09:16:02 +05:30
parent b8937bc151
commit 3b4a242e26
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
kitty/shaders.c
View file

@ -302,11 +302,6 @@ draw_graphics(ssize_t vao_idx, ssize_t gvao_idx, ImageRenderData *data, GLuint s
static void
draw_all_cells(ssize_t vao_idx, ssize_t gvao_idx, Screen *screen) {
bind_program(CELL_PROGRAM);
static bool cell_constants_set = false;
if (!cell_constants_set) {
glUniform1i(glGetUniformLocation(program_id(CELL_PROGRAM), "sprites"), SPRITE_MAP_UNIT);
cell_constants_set = true;
}
glDrawArraysInstanced(GL_TRIANGLE_FAN, 0, 4, screen->lines * screen->columns);
if (screen->grman->count) draw_graphics(vao_idx, gvao_idx, screen->grman->render_data, 0, screen->grman->count);
}
@ -340,6 +335,12 @@ draw_cells(ssize_t vao_idx, ssize_t gvao_idx, GLfloat xstart, GLfloat ystart, GL
(GLsizei)(ceilf(SCALE(height, h / 2.0f)))
);
#undef SCALE
static bool cell_constants_set = false;
if (!cell_constants_set) {
glUniform1i(glGetUniformLocation(program_id(CELL_PROGRAM), "sprites"), SPRITE_MAP_UNIT);
glUniform1i(glGetUniformLocation(program_id(CELL_FOREGROUND_PROGRAM), "sprites"), SPRITE_MAP_UNIT);
cell_constants_set = true;
}
if (screen->grman->num_of_negative_refs) draw_cells_interleaved(vao_idx, gvao_idx, screen);
else draw_all_cells(vao_idx, gvao_idx, screen);
}