diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 28b0ef9..33a9820 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -22,7 +22,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 with: - submodules: 'true' + submodules: 'recursive' - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v3 with: diff --git a/src/generate.py b/src/generate.py index 27ddb87..174d6cd 100644 --- a/src/generate.py +++ b/src/generate.py @@ -18,9 +18,9 @@ from typing import List, NamedTuple from pygltflib import GLTF2 -from metashade.hlsl.util import dxc from metashade.util import perf, spirv_cross -from metashade.glsl.util import glslc +from metashade.hlsl.util import dxc +from metashade.glsl.util import glslang, glslc import _impl @@ -155,11 +155,10 @@ def compile(self, to_glsl : bool) -> str: try: glsl_output_path = Path(self._file_path).with_suffix('.spv') - glslc.compile( + glslang.compile( src_path = self._file_path, target_env = 'vulkan1.1', - shader_stage = self._get_glslc_stage(), - entry_point_name = _impl.entry_point_name, + shader_stage = 'frag', output_path = glsl_output_path ) except subprocess.CalledProcessError as err: @@ -265,9 +264,11 @@ def generate( if compile: print() dxc.identify() + glslang.identify() + if to_glsl: - spirv_cross.identify() glslc.identify() + spirv_cross.identify() if serial: for shader in shaders: diff --git a/tests/test_generate.py b/tests/test_generate.py index a7f22a4..da6015f 100644 --- a/tests/test_generate.py +++ b/tests/test_generate.py @@ -36,5 +36,5 @@ def test_generate(self): compile = True, to_glsl = False, skip_codegen = False, - serial = False + serial = False )