Skip to content

Commit 6e8aa02

Browse files
committed
updated linux aarch64 infrastructure
1 parent 838bcce commit 6e8aa02

File tree

6 files changed

+7
-4
lines changed

6 files changed

+7
-4
lines changed
Binary file not shown.

compushady/shaders/hlsl.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
if platform.machine() == "armv7l":
1717
lib_path = os.path.join(lib_dir, "libdxcompiler_armv7l.so.3.7")
1818
elif platform.machine() == "aarch64":
19-
lib_path = os.path.join(lib_dir, "libdxcompiler_aarch64.so.3.7")
19+
lib_path = os.path.join(lib_dir, "libdxcompiler_aarch64.so")
2020
else:
2121
lib_path = os.path.join(lib_dir, "libdxcompiler_x86_64.so")
2222
import ctypes

compushady/shaders/naga.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
if platform.system() == "Windows":
88
lib_name = "compushady_naga.dll"
99
elif platform.system() == "Linux":
10-
lib_name = "libcompushady_naga_x86_64.so"
10+
if platform.machine() == "aarch64":
11+
lib_name = "libcompushady_naga_aarch64.so"
12+
else:
13+
lib_name = "libcompushady_naga_x86_64.so"
1114
elif platform.system() == "Darwin":
1215
lib_name = "libcompushady_naga.dylib"
1316

run_tests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
cd test
2-
COMPUSHADY_BACKEND=vulkan python3 -m unittest
2+
COMPUSHADY_BACKEND=vulkan python3 -m unittest $1

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
if platform.machine() == "armv7l":
111111
additional_files = ["backends/libdxcompiler_armv7l.so.3.7"]
112112
elif platform.machine() == "aarch64":
113-
additional_files = ["backends/libdxcompiler_aarch64.so.3.7"]
113+
additional_files = ["backends/libdxcompiler_aarch64.so", "backends/libcompushady_naga_aarch64.so"]
114114
else:
115115
additional_files = ["backends/libdxcompiler_x86_64.so", "backends/libcompushady_naga_x86_64.so"]
116116
elif is_mac:

0 commit comments

Comments
 (0)