CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-08-04 14:46:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Decrease the number of cell variants

Browse source
This commit is contained in:
Kovid Goyal 2026-07-07 14:48:48 +05:30
parent 973c3d9030
commit 9b325d3de0
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kitty/shaders/cell.slang
View file

@ -14,8 +14,10 @@ import linear2srgb;
extern static const uint FG_OVERRIDE_ALGO;
extern static const bool TEXT_NEW_GAMMA;
extern static const bool ONLY_FOREGROUND;
extern static const bool ONLY_BACKGROUND;
extern static const uint RENDER_MODE;
static const bool ONLY_FOREGROUND = RENDER_MODE == 2;
static const bool ONLY_BACKGROUND = RENDER_MODE == 1;
// Inputs {{{
struct CellRenderData

15
kitty/shaders/slang.py
View file

@ -114,7 +114,7 @@ class Specialization(NamedTuple):
return f'.{self.name}' if self.name else '.default-specialization'
def cell_variant(opts: Options = defaults, only_fg: bool = False, only_bg: bool = False) -> dict[str, str]:
def cell_variant(opts: Options = defaults, program: int = CELL_PROGRAM) -> dict[str, str]:
text_fg_override_threshold: float = opts.text_fg_override_threshold[0]
algo = '0'
match opts.text_fg_override_threshold[1]:
@ -126,17 +126,17 @@ def cell_variant(opts: Options = defaults, only_fg: bool = False, only_bg: bool
algo = '2'
if not text_fg_override_threshold:
algo = '0'
render_mode = (CELL_PROGRAM, CELL_BG_PROGRAM, CELL_FG_PROGRAM).index(program)
return {
'FG_OVERRIDE_ALGO': algo,
'TEXT_NEW_GAMMA': 'false' if opts.text_composition_strategy == 'legacy' else 'true',
'ONLY_FOREGROUND': 'true' if only_fg else 'false',
'ONLY_BACKGROUND': 'true' if only_bg else 'false',
'RENDER_MODE': str(render_mode),
}
@lru_cache(maxsize=2)
def cell_variations() -> tuple[MappingProxyType[str, str], ...]:
variations = {'FG_OVERRIDE_ALGO': ('0', '1', '2')}
variations = {'FG_OVERRIDE_ALGO': ('0', '1', '2'), 'RENDER_MODE': ('0', '1', '2')}
bool_variations = 'false', 'true'
variants_dict = {k: variations.get(k, bool_variations) for k in cell_variant()}
return tuple(MappingProxyType(dict(zip(variants_dict.keys(), comb))) for comb in product(*variants_dict.values()))
@ -191,12 +191,11 @@ class LoadShaderPrograms:
opts = self.get_options()
self.text_old_gamma = opts.text_composition_strategy == 'legacy'
self.text_fg_override_threshold = opts.text_fg_override_threshold
for prog, (only_fg, only_bg) in {
CELL_PROGRAM: (False, False), CELL_FG_PROGRAM: (True, False), CELL_BG_PROGRAM: (False, True),
}.items():
v = cell_variant(opts, only_fg=only_fg, only_bg=only_bg)
def cell(prog: int) -> None:
v = cell_variant(opts, program=prog)
vert, frag = glsl_shaders('cell', variant_name(v, default_cell_variant))
compile_program(prog, (vert,), (frag,), allow_recompile)
cell(CELL_PROGRAM), cell(CELL_BG_PROGRAM), cell(CELL_FG_PROGRAM)
for prog, vname in {
GRAPHICS_PROGRAM: '', GRAPHICS_ALPHA_MASK_PROGRAM: 'alpha_mask',
GRAPHICS_PREMULT_PROGRAM: 'premult',