mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-25 17:52:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Lower glsl version to 140 to match existing shaders

Browse Source
This commit is contained in:
Kovid Goyal
2026-07-02 13:47:37 +05:30
parent fe84bc9225
commit 0d5a7511b1
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kitty/shaders/slang.py
View File

@@ -27,6 +27,7 @@ from kitty.fast_data_types import (
DECORATION, DECORATION,
DECORATION_MASK, DECORATION_MASK,
DIM, DIM,
GLSL_VERSION,
MARK, MARK,
MARK_MASK, MARK_MASK,
REVERSE, REVERSE,
@@ -336,9 +337,10 @@ def commands_to_compile_to_spirv(sources: dict[str, SlangFile], build_dir: str,
def commands_to_compile_to_glsl(sources: dict[str, SlangFile], build_dir: str, dest_dir: str, built_glsl_files: list[str]) -> Iterator[Command]: def commands_to_compile_to_glsl(sources: dict[str, SlangFile], build_dir: str, dest_dir: str, built_glsl_files: list[str]) -> Iterator[Command]:
glsl_version = max(150, GLSL_VERSION) # slangc fails with glsl_140 https://github.com/shader-slang/slang/issues/11898
for base_dest, slang_module, cmd, sfile in iter_entry_point_shaders(sources, build_dir, dest_dir): for base_dest, slang_module, cmd, sfile in iter_entry_point_shaders(sources, build_dir, dest_dir):
module_mtime = os.path.getmtime(slang_module) module_mtime = os.path.getmtime(slang_module)
extra_cmd = ['-line-directive-mode', 'none', '-target', 'glsl', '-profile', 'glsl_330'] extra_cmd = ['-line-directive-mode', 'none', '-target', 'glsl', '-profile', f'glsl_{glsl_version}']
for ep in sfile.entry_points: for ep in sfile.entry_points:
for sp in sfile.specializations: for sp in sfile.specializations:
v = {Stage.vertex: 'vert', Stage.fragment: 'frag'}[ep.stage] v = {Stage.vertex: 'vert', Stage.fragment: 'frag'}[ep.stage]
@@ -402,7 +404,9 @@ def fixup_opengl_code(glsl_code: str, path: str) -> tuple[str, dict[str, Any]]:
current_uniform_names = [] current_uniform_names = []
else: else:
if line.startswith('#version '): if line.startswith('#version '):
line = '#version 330 core' line = f'#version {GLSL_VERSION}'
if not is_fragment_shader:
line += '\n#extension GL_ARB_explicit_attrib_location : require'
elif line.startswith('#extension ') or line in ('layout(row_major) buffer;', 'layout(push_constant)'): elif line.startswith('#extension ') or line in ('layout(row_major) buffer;', 'layout(push_constant)'):
line = '// ' + line line = '// ' + line
elif line.startswith('layout(binding ='): elif line.startswith('layout(binding ='):