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

Preserve line numbers when adding in shifts to shader

Browse Source
This commit is contained in:
Kovid Goyal 2018-05-23 19:41:54 +05:30
parent f4792a1e3d
commit 23d0f5ce32
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kitty/cell_vertex.glsl
View File

@ -1,7 +1,10 @@
#version GLSL_VERSION #version GLSL_VERSION
#define WHICH_PROGRAM #define WHICH_PROGRAM
#define NOT_TRANSPARENT #define NOT_TRANSPARENT
#define SHIFTS #define DECORATION_SHIFT {DECORATION_SHIFT}
#define REVERSE_SHIFT {REVERSE_SHIFT}
#define STRIKE_SHIFT {STRIKE_SHIFT}
#define DIM_SHIFT {DIM_SHIFT}
// Inputs {{{ // Inputs {{{
layout(std140) uniform CellRenderData { layout(std140) uniform CellRenderData {

6
kitty/window.py
View File

@ -65,10 +65,8 @@ def load_shader_programs(semi_transparent=0):
'FOREGROUND': CELL_FG_PROGRAM, 'FOREGROUND': CELL_FG_PROGRAM,
}.items(): }.items():
vv, ff = v.replace('WHICH_PROGRAM', which), f.replace('WHICH_PROGRAM', which) vv, ff = v.replace('WHICH_PROGRAM', which), f.replace('WHICH_PROGRAM', which)
shifts = '\n'.join('#define {} {}'.format(name, val) for name, val in ( for gln, pyn in {'REVERSE_SHIFT': REVERSE, 'STRIKE_SHIFT': STRIKETHROUGH, 'DIM_SHIFT': DIM, 'DECORATION_SHIFT': DECORATION}.items():
('DECORATION_SHIFT', DECORATION), ('REVERSE_SHIFT', REVERSE), ('STRIKE_SHIFT', STRIKETHROUGH), ('DIM_SHIFT', DIM), vv = vv.replace('{{{}}}'.format(gln), str(pyn), 1)
))
vv = vv.replace('#define SHIFTS', shifts)
if semi_transparent: if semi_transparent:
vv = vv.replace('#define NOT_TRANSPARENT', '#define TRANSPARENT') vv = vv.replace('#define NOT_TRANSPARENT', '#define TRANSPARENT')
ff = ff.replace('#define NOT_TRANSPARENT', '#define TRANSPARENT') ff = ff.replace('#define NOT_TRANSPARENT', '#define TRANSPARENT')