From 33463560f58d585ad51924d0c0b40dff20230090 Mon Sep 17 00:00:00 2001 From: rudolf-blue Date: Thu, 8 Oct 2026 15:01:12 -0400 Subject: [PATCH] Grow the sprite decorations map geometrically --- kitty/fast_data_types.pyi | 1 + kitty/shaders.c | 37 ++++++++++++++++++++++++++++++------- kitty_tests/fonts.py | 16 ++++++++++++++++ 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/kitty/fast_data_types.pyi b/kitty/fast_data_types.pyi index 122bd5c1e..e16279997 100644 --- a/kitty/fast_data_types.pyi +++ b/kitty/fast_data_types.pyi @@ -538,6 +538,7 @@ def compile_program( pass def custom_shader_needs_render(before: Tuple[bool, int, int], after: Tuple[bool, int, int], event_mask: int, now: int) -> bool: ... +def decorations_map_new_size(count: int, current_capacity: int, max_size: int) -> Optional[Tuple[int, int]]: ... def simulate_custom_shader_render_ticks(num_ticks: int, event_mask: int = 0, initialize: bool = False) -> list[bool]: ... def set_os_window_chrome(os_window_id: int) -> bool: pass diff --git a/kitty/shaders.c b/kitty/shaders.c index 5ffc0cd81..514db5b3e 100644 --- a/kitty/shaders.c +++ b/kitty/shaders.c @@ -233,19 +233,31 @@ setup_new_sprites_texture(GLenum texture_type) { return tex; } +static bool +decorations_map_new_size(size_t count, size_t current_capacity, size_t max_size, GLint *width, GLint *height) { + const size_t max_capacity = max_size * max_size; + if (count >= max_capacity) return false; + size_t capacity = MAX(MAX(count + 256, current_capacity * 2), (size_t)4096); + capacity = MIN(capacity, max_capacity); + if (capacity <= max_size) { + *width = capacity; + *height = 1; + } else { + *width = max_size; + *height = (capacity + max_size - 1) / max_size; + } + return true; +} + static void realloc_sprite_decorations_texture_if_needed(FONTS_DATA_HANDLE fg) { #define dm (sm->decorations_map) SpriteMap *sm = (SpriteMap *)fg->sprite_map; size_t current_capacity = (size_t)dm.width * dm.height; if (dm.count < current_capacity && dm.texture_id) return; - GLint new_capacity = dm.count + 256; - GLint width = new_capacity, height = 1; - if (new_capacity > sm->max_texture_size) { - width = sm->max_texture_size; - height = 1 + new_capacity / width; - } - if (height > sm->max_texture_size) fatal("Max texture size too small for sprite decorations map, maybe switch to using a GL_TEXTURE_2D_ARRAY"); + GLint width, height; + if (!decorations_map_new_size(dm.count, current_capacity, sm->max_texture_size, &width, &height)) + fatal("Max texture size too small for sprite decorations map, maybe switch to using a GL_TEXTURE_2D_ARRAY"); const GLenum texture_type = GL_TEXTURE_2D; GLuint tex = setup_new_sprites_texture(texture_type); glTexImage2D(texture_type, 0, GL_R32UI, width, height, 0, GL_RED_INTEGER, GL_UNSIGNED_INT, NULL); @@ -3372,6 +3384,16 @@ sprite_map_set_limits(PyObject UNUSED *self, PyObject *args) { Py_RETURN_NONE; } +// test only wrapper for decorations_map_new_size +static PyObject * +pydecorations_map_new_size(PyObject *self UNUSED, PyObject *args) { + unsigned long count, current_capacity, max_size; + if (!PyArg_ParseTuple(args, "kkk", &count, ¤t_capacity, &max_size)) return NULL; + GLint w, h; + if (!decorations_map_new_size(count, current_capacity, max_size, &w, &h)) Py_RETURN_NONE; + return Py_BuildValue("ii", (int)w, (int)h); +} + // Test only. Wraps custom_shader_needs_render() so the redraw decision can be // exercised from the Python test suite without a GPU context. Each state is a // (has_active_shaders, min_step, next_end_at) tuple. @@ -3434,6 +3456,7 @@ static PyMethodDef module_methods[] = { MW(bind_program, METH_O), MW(unbind_program, METH_NOARGS), MW(custom_shader_needs_render, METH_VARARGS), + MW(decorations_map_new_size, METH_VARARGS), MW(simulate_custom_shader_render_ticks, METH_VARARGS), {NULL, NULL, 0, NULL} /* Sentinel */ diff --git a/kitty_tests/fonts.py b/kitty_tests/fonts.py index 4b57117d8..02171d66d 100644 --- a/kitty_tests/fonts.py +++ b/kitty_tests/fonts.py @@ -331,6 +331,22 @@ class FontBaseTest(BaseTest): class Rendering(FontBaseTest): + def test_decorations_map_growth(self): + from kitty.fast_data_types import decorations_map_new_size as size + m = 4096 + self.ae(size(0, 0, m), (4096, 1)) + self.ae(size(5000, 4096, m), (4096, 2)) + cap, reallocs = 0, 0 + for count in range(100000): + if count >= cap: + w, h = size(count, cap, m) + cap, reallocs = w * h, reallocs + 1 + self.assertLess(reallocs, 10) + full = m * m + self.ae(size(m * (m - 1), m * (m - 1), m), (m, m)) + self.ae(size(full - 1, full // 2, m), (m, m)) + self.assertIsNone(size(full, full, m)) + def test_sprite_map(self): sprite_map_set_limits(10, 3) sprite_map_set_layout(5, 4) # 4 because of underline_exclusion row