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

Initialize uniforms for all cell program variants

Browse Source
This commit is contained in:
Kovid Goyal 2017-10-04 14:46:36 +05:30
parent ead73c8209
commit ad040271b9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kitty/cell_vertex.glsl
View File

@ -23,6 +23,9 @@ out vec3 strike_pos;
out vec3 foreground; out vec3 foreground;
out vec3 decoration_fg; out vec3 decoration_fg;
#endif #endif
#if defined SPECIAL
in float is_selected;
#endif
out vec3 background; out vec3 background;
const uvec2 pos_map[] = uvec2[4]( const uvec2 pos_map[] = uvec2[4](

31
kitty/shaders.c
View File

@ -7,7 +7,7 @@
#include "gl.h" #include "gl.h"
enum { CELL_PROGRAM, CURSOR_PROGRAM, BORDERS_PROGRAM, NUM_PROGRAMS }; enum { CELL_PROGRAM, CELL_BACKGROUND_PROGRAM, CELL_SPECIAL_PROGRAM, CELL_FOREGROUND_PROGRAM, CURSOR_PROGRAM, BORDERS_PROGRAM, NUM_PROGRAMS };
// Sprites {{{ // Sprites {{{
typedef struct { typedef struct {
@ -175,17 +175,22 @@ destroy_sprite_map() {
// Cell {{{ // Cell {{{
static UniformBlock cell_render_data; typedef struct {
static ArrayInformation cell_color_table; UniformBlock render_data;
ArrayInformation color_table;
} CellProgramLayout;
static CellProgramLayout cell_program_layouts[NUM_PROGRAMS];
static void static void
init_cell_program() { init_cell_program() {
cell_render_data.index = block_index(CELL_PROGRAM, "CellRenderData"); for (int i = CELL_PROGRAM; i <= CELL_FOREGROUND_PROGRAM; i++) {
cell_render_data.size = block_size(CELL_PROGRAM, cell_render_data.index); cell_program_layouts[i].render_data.index = block_index(i, "CellRenderData");
cell_color_table.size = get_uniform_information(CELL_PROGRAM, "color_table[0]", GL_UNIFORM_SIZE); cell_program_layouts[i].render_data.size = block_size(i, cell_program_layouts[i].render_data.index);
cell_color_table.offset = get_uniform_information(CELL_PROGRAM, "color_table[0]", GL_UNIFORM_OFFSET); cell_program_layouts[i].color_table.size = get_uniform_information(i, "color_table[0]", GL_UNIFORM_SIZE);
cell_color_table.stride = get_uniform_information(CELL_PROGRAM, "color_table[0]", GL_UNIFORM_ARRAY_STRIDE); cell_program_layouts[i].color_table.offset = get_uniform_information(i, "color_table[0]", GL_UNIFORM_OFFSET);
#undef SET_LOC cell_program_layouts[i].color_table.stride = get_uniform_information(i, "color_table[0]", GL_UNIFORM_ARRAY_STRIDE);
}
} }
static ssize_t static ssize_t
@ -202,7 +207,7 @@ create_cell_vao() {
add_buffer_to_vao(vao_idx, GL_ARRAY_BUFFER); add_buffer_to_vao(vao_idx, GL_ARRAY_BUFFER);
A(is_selected, 1, GL_FLOAT, NULL, 0); A(is_selected, 1, GL_FLOAT, NULL, 0);
size_t bufnum = add_buffer_to_vao(vao_idx, GL_UNIFORM_BUFFER); size_t bufnum = add_buffer_to_vao(vao_idx, GL_UNIFORM_BUFFER);
alloc_vao_buffer(vao_idx, cell_render_data.size, bufnum, GL_STREAM_DRAW); alloc_vao_buffer(vao_idx, cell_program_layouts[CELL_PROGRAM].render_data.size, bufnum, GL_STREAM_DRAW);
return vao_idx; return vao_idx;
#undef A #undef A
#undef A1 #undef A1
@ -225,7 +230,7 @@ cell_update_uniform_block(ssize_t vao_idx, Screen *screen, int uniform_buffer, G
// Send the uniform data // Send the uniform data
rd = (struct CellRenderData*)map_vao_buffer(vao_idx, uniform_buffer, GL_WRITE_ONLY); rd = (struct CellRenderData*)map_vao_buffer(vao_idx, uniform_buffer, GL_WRITE_ONLY);
if (UNLIKELY(screen->color_profile->dirty)) { if (UNLIKELY(screen->color_profile->dirty)) {
copy_color_table_to_buffer(screen->color_profile, (GLuint*)rd, cell_color_table.offset / sizeof(GLuint), cell_color_table.stride / sizeof(GLuint)); copy_color_table_to_buffer(screen->color_profile, (GLuint*)rd, cell_program_layouts[CELL_PROGRAM].color_table.offset / sizeof(GLuint), cell_program_layouts[CELL_PROGRAM].color_table.stride / sizeof(GLuint));
} }
// Cursor position // Cursor position
if (cursor->is_visible && cursor->shape == CURSOR_BLOCK) { if (cursor->is_visible && cursor->shape == CURSOR_BLOCK) {
@ -287,7 +292,7 @@ draw_cells_impl(ssize_t vao_idx, GLfloat xstart, GLfloat ystart, GLfloat dx, GLf
glUniform1i(glGetUniformLocation(program_id(CELL_PROGRAM), "sprites"), SPRITE_MAP_UNIT); check_gl(); glUniform1i(glGetUniformLocation(program_id(CELL_PROGRAM), "sprites"), SPRITE_MAP_UNIT); check_gl();
cell_constants_set = true; cell_constants_set = true;
} }
bind_vao_uniform_buffer(vao_idx, uniform_buffer, cell_render_data.index); bind_vao_uniform_buffer(vao_idx, uniform_buffer, cell_program_layouts[CELL_PROGRAM].render_data.index);
bind_vertex_array(vao_idx); bind_vertex_array(vao_idx);
glDrawArraysInstanced(GL_TRIANGLE_FAN, 0, 4, screen->lines * screen->columns); check_gl(); glDrawArraysInstanced(GL_TRIANGLE_FAN, 0, 4, screen->lines * screen->columns); check_gl();
} }
@ -534,7 +539,7 @@ init_shaders_debug(PyObject *module) {
init_shaders(PyObject *module) { init_shaders(PyObject *module) {
#endif #endif
#define C(x) if (PyModule_AddIntConstant(module, #x, x) != 0) { PyErr_NoMemory(); return false; } #define C(x) if (PyModule_AddIntConstant(module, #x, x) != 0) { PyErr_NoMemory(); return false; }
C(CELL_PROGRAM); C(CURSOR_PROGRAM); C(BORDERS_PROGRAM); C(CELL_PROGRAM); C(CELL_BACKGROUND_PROGRAM); C(CELL_SPECIAL_PROGRAM); C(CELL_FOREGROUND_PROGRAM); C(CURSOR_PROGRAM); C(BORDERS_PROGRAM);
C(GLSL_VERSION); C(GLSL_VERSION);
C(GL_VERSION); C(GL_VERSION);
C(GL_VENDOR); C(GL_VENDOR);

15
kitty/window.py
View File

@ -14,9 +14,10 @@ from .constants import (
viewport_size, wakeup viewport_size, wakeup
) )
from .fast_data_types import ( from .fast_data_types import (
BRACKETED_PASTE_END, BRACKETED_PASTE_START, CELL_PROGRAM, CURSOR_PROGRAM, BRACKETED_PASTE_END, BRACKETED_PASTE_START, CELL_BACKGROUND_PROGRAM,
SCROLL_FULL, SCROLL_LINE, SCROLL_PAGE, Screen, compile_program, CELL_FOREGROUND_PROGRAM, CELL_PROGRAM, CELL_SPECIAL_PROGRAM,
create_cell_vao, glfw_post_empty_event, init_cell_program, CURSOR_PROGRAM, SCROLL_FULL, SCROLL_LINE, SCROLL_PAGE, Screen,
compile_program, create_cell_vao, glfw_post_empty_event, init_cell_program,
init_cursor_program, remove_vao, set_window_render_data, init_cursor_program, remove_vao, set_window_render_data,
update_window_title, update_window_visibility update_window_title, update_window_visibility
) )
@ -52,8 +53,12 @@ def calculate_gl_geometry(window_geometry, viewport_width, viewport_height, cell
def load_shader_programs(): def load_shader_programs():
v, f = load_shaders('cell') v, f = load_shaders('cell')
v, f = v.replace('WHICH_PROGRAM', 'ALL'), f.replace('WHICH_PROGRAM', 'ALL') for which, p in {
compile_program(CELL_PROGRAM, v, f) 'ALL': CELL_PROGRAM, 'BACKGROUND': CELL_BACKGROUND_PROGRAM, 'SPECIAL': CELL_SPECIAL_PROGRAM,
'FOREGROUND': CELL_FOREGROUND_PROGRAM
}.items():
vv, ff = v.replace('WHICH_PROGRAM', which), f.replace('WHICH_PROGRAM', which)
compile_program(p, vv, ff)
init_cell_program() init_cell_program()
compile_program(CURSOR_PROGRAM, *load_shaders('cursor')) compile_program(CURSOR_PROGRAM, *load_shaders('cursor'))
init_cursor_program() init_cursor_program()