Use to_spirv
This commit is contained in:
@@ -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
|
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
|
- name: Get Submodules
|
||||||
run: git submodule update --init --recursive
|
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
|
- name: Compile
|
||||||
run: |
|
run: |
|
||||||
cd armorpaint
|
cd armorpaint
|
||||||
|
|||||||
@@ -5,4 +5,3 @@
|
|||||||
armorlab/assets/models/*.onnx
|
armorlab/assets/models/*.onnx
|
||||||
armorlab/assets/models/*.txt
|
armorlab/assets/models/*.txt
|
||||||
armorlab/onnx
|
armorlab/onnx
|
||||||
glsl_to_spirv
|
|
||||||
|
|||||||
@@ -56,6 +56,5 @@ cd armortools/armorpaint
|
|||||||
|
|
||||||
**Linux VKRT** *wip*
|
**Linux VKRT** *wip*
|
||||||
```bash
|
```bash
|
||||||
git clone --recursive https://github.com/armory3d/glsl_to_spirv
|
|
||||||
../armorcore/make --graphics vulkan --run
|
../armorcore/make --graphics vulkan --run
|
||||||
```
|
```
|
||||||
|
|||||||
+1
-1
@@ -29,7 +29,7 @@ let project = new Project("Base");
|
|||||||
|
|
||||||
if (graphics === "vulkan") {
|
if (graphics === "vulkan") {
|
||||||
project.addDefine("KINC_VKRT");
|
project.addDefine("KINC_VKRT");
|
||||||
project.addProject("../" + dir + "/glsl_to_spirv");
|
project.addProject("../armorcore/tools/ashader/to_spirv");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flags.with_onnx) {
|
if (flags.with_onnx) {
|
||||||
|
|||||||
Reference in New Issue
Block a user