diff --git a/.github/workflows/linux_vulkan.yml b/.github/workflows/linux_vulkan.yml index 82db8d56..213b10f9 100644 --- a/.github/workflows/linux_vulkan.yml +++ b/.github/workflows/linux_vulkan.yml @@ -21,8 +21,6 @@ jobs: run: sudo apt-get install libasound2-dev libxrandr-dev libxinerama-dev libgl1-mesa-dev libxi-dev libxcursor-dev libudev-dev libgtk-3-dev --yes --quiet - name: Get Submodules run: git submodule update --init --recursive - - name: Clone krafix - run: git clone --recursive https://github.com/armory3d/glsl_to_spirv armorpaint/glsl_to_spirv - name: Compile run: | cd armorpaint diff --git a/.gitignore b/.gitignore index c79165e5..b0e4afdf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ armorlab/assets/models/*.onnx armorlab/assets/models/*.txt armorlab/onnx -glsl_to_spirv diff --git a/armorpaint/README.md b/armorpaint/README.md index 036e580e..e955f945 100644 --- a/armorpaint/README.md +++ b/armorpaint/README.md @@ -56,6 +56,5 @@ cd armortools/armorpaint **Linux VKRT** *wip* ```bash -git clone --recursive https://github.com/armory3d/glsl_to_spirv ../armorcore/make --graphics vulkan --run ``` diff --git a/base/project.js b/base/project.js index 0ef24797..474e1cf3 100644 --- a/base/project.js +++ b/base/project.js @@ -29,7 +29,7 @@ let project = new Project("Base"); if (graphics === "vulkan") { project.addDefine("KINC_VKRT"); - project.addProject("../" + dir + "/glsl_to_spirv"); + project.addProject("../armorcore/tools/ashader/to_spirv"); } if (flags.with_onnx) {