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

Nicer validation integration

Browse Source
This commit is contained in:
Kovid Goyal
2026-07-01 15:10:14 +05:30
parent 18d1614924
commit 024296f36e
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kitty/shaders/slang.py
View File

@@ -474,8 +474,8 @@ def compile_builtin_shaders(build_dir: str, dest_dir: str, parallel_run: Paralle
parallel_run(chain(spirv_commands, glsl_commands)) parallel_run(chain(spirv_commands, glsl_commands))
fixup_opengl_files(*built_glsl_files) fixup_opengl_files(*built_glsl_files)
if shutil.which('glslangValidator'): if shutil.which('glslangValidator'):
from kitty.shaders.validate_shaders import validate_glsl_files from kitty.shaders.validate_shaders import validation_command_for_file
validate_glsl_files(built_glsl_files) parallel_run((True, f'Validating |{os.path.basename(x)}| ...', validation_command_for_file(x)) for x in built_glsl_files)
def main() -> None: def main() -> None:

11
kitty/shaders/validate_shaders.py
View File

@@ -13,17 +13,22 @@ stage_mapping = {
} }
def validation_command_for_file(path: str | Path) -> list[str]:
file_path = Path(path)
matched_ext = next(ext for ext in stage_mapping if file_path.name.endswith(ext))
stage = stage_mapping[matched_ext]
return ['glslangValidator', '-S', stage, str(file_path)]
def validate_glsl_files(shader_files: Iterable[str | Path], verbose: bool = False) -> None: def validate_glsl_files(shader_files: Iterable[str | Path], verbose: bool = False) -> None:
error_count = 0 error_count = 0
# Process each shader file # Process each shader file
for file_path in sorted(Path(f) for f in shader_files): for file_path in sorted(Path(f) for f in shader_files):
# Identify extension matching suffix # Identify extension matching suffix
matched_ext = next(ext for ext in stage_mapping if file_path.name.endswith(ext))
stage = stage_mapping[matched_ext]
if verbose: if verbose:
print(f'Validating: {file_path.name}') print(f'Validating: {file_path.name}')
result = subprocess.run(['glslangValidator', '-S', stage, str(file_path)],) result = subprocess.run(validation_command_for_file(file_path))
# Check exit code # Check exit code
if result.returncode != 0: if result.returncode != 0: