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

Do a single pass over the cell vertex shader to set the defines

Browse Source
This commit is contained in:
Kovid Goyal 2022-02-04 14:34:41 +05:30
parent f9b35c71d7
commit 9fe22a5c27
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kitty/cell_fragment.glsl
View File

@ -1,5 +1,5 @@
#version GLSL_VERSION
#define WHICH_PROGRAM
#define {WHICH_PROGRAM}
#define NOT_TRANSPARENT
#if defined(SIMPLE) || defined(BACKGROUND) || defined(SPECIAL)

2
kitty/cell_vertex.glsl
View File

@ -1,5 +1,5 @@
#version GLSL_VERSION
#define WHICH_PROGRAM
#define {WHICH_PROGRAM}
#define NOT_TRANSPARENT
#define DECORATION_SHIFT {DECORATION_SHIFT}
#define REVERSE_SHIFT {REVERSE_SHIFT}

35
kitty/window.py
View File

@ -3,6 +3,7 @@
import json
import os
import re
import sys
import weakref
from collections import deque
@ -208,6 +209,15 @@ def as_text(
return ans
def multi_replace(src: str, **replacements: Any) -> str:
r = {k: str(v) for k, v in replacements.items()}
def sub(m: 're.Match[str]') -> str:
return r.get(m.group(1), m.group(1))
return re.sub(r'\{([A-Z_]+)\}', sub, src)
class LoadShaderPrograms:
def __call__(self, semi_transparent: bool = False) -> None:
@ -220,18 +230,19 @@ class LoadShaderPrograms:
'SPECIAL': CELL_SPECIAL_PROGRAM,
'FOREGROUND': CELL_FG_PROGRAM,
}.items():
vv, ff = v.replace('WHICH_PROGRAM', which), f.replace('WHICH_PROGRAM', which)
for gln, pyn in {
'REVERSE_SHIFT': REVERSE,
'STRIKE_SHIFT': STRIKETHROUGH,
'DIM_SHIFT': DIM,
'DECORATION_SHIFT': DECORATION,
'MARK_SHIFT': MARK,
'MARK_MASK': MARK_MASK,
'DECORATION_MASK': DECORATION_MASK,
'STRIKE_SPRITE_INDEX': NUM_UNDERLINE_STYLES + 1,
}.items():
vv = vv.replace(f'{{{gln}}}', str(pyn), 1)
ff = f.replace('{WHICH_PROGRAM}', which)
vv = multi_replace(
v,
WHICH_PROGRAM=which,
REVERSE_SHIFT=REVERSE,
STRIKE_SHIFT=STRIKETHROUGH,
DIM_SHIFT=DIM,
DECORATION_SHIFT=DECORATION,
MARK_SHIFT=MARK,
MARK_MASK=MARK_MASK,
DECORATION_MASK=DECORATION_MASK,
STRIKE_SPRITE_INDEX=NUM_UNDERLINE_STYLES + 1,
)
if semi_transparent:
vv = vv.replace('#define NOT_TRANSPARENT', '#define TRANSPARENT')
ff = ff.replace('#define NOT_TRANSPARENT', '#define TRANSPARENT')