Skip to content

Commit bbf0ee6

Browse files
committed
Switch to Vulkan-Shim-Loader
1 parent a1f85e3 commit bbf0ee6

File tree

1 file changed

+12
-25
lines changed

1 file changed

+12
-25
lines changed

scripts.d/47-vulkan/45-vulkan-loader.sh

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,29 @@
11
#!/bin/bash
22

3-
SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Loader.git"
4-
SCRIPT_COMMIT="v1.4.325"
5-
SCRIPT_TAGFILTER="v?.*.*"
3+
SCRIPT_REPO="https://github.com/BtbN/Vulkan-Shim-Loader.git"
4+
SCRIPT_COMMIT="2e50a8582a2ce974f5d6545582d2c36094dd45c3"
5+
6+
SCRIPT_REPO2="https://github.com/KhronosGroup/Vulkan-Headers.git"
7+
SCRIPT_COMMIT2="v1.4.325"
8+
SCRIPT_TAGFILTER2="v?.*.*"
69

710
ffbuild_enabled() {
811
[[ $ADDINS_STR == *4.4* ]] && return -1
912
return 0
1013
}
1114

15+
ffbuild_dockerdl() {
16+
default_dl .
17+
echo "git-mini-clone \"$SCRIPT_REPO2\" \"$SCRIPT_COMMIT2\" Vulkan-Headers"
18+
}
19+
1220
ffbuild_dockerbuild() {
1321
mkdir build && cd build
1422

1523
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
16-
-DBUILD_TESTS=OFF -DBUILD_WERROR=OFF -DLOADER_CODEGEN=ON -DUSE_GAS=OFF -DUSE_MASM=OFF ..
24+
-DVULKAN_SHIM_IMPERSONATE=ON ..
1725
make -j$(nproc)
1826
make install DESTDIR="$FFBUILD_DESTDIR"
19-
20-
if [[ $TARGET == win* ]]; then
21-
if [[ $CC == *clang* ]]; then
22-
echo 'Libs.private: -Wl,-delayload,vulkan-1.dll' >> "$FFBUILD_DESTPREFIX"/lib/pkgconfig/vulkan.pc
23-
else
24-
rm "$FFBUILD_DESTPREFIX"/lib/libvulkan-1.dll.a
25-
"$GENDEF" "$FFBUILD_DESTPREFIX"/bin/vulkan-1.dll
26-
"$DLLTOOL" -d vulkan-1.def --output-delaylib "$FFBUILD_DESTPREFIX"/lib/libvulkan-1.a
27-
fi
28-
29-
rm "$FFBUILD_DESTPREFIX"/bin/vulkan-1.dll
30-
sed -i -e 's/^\(Libs:\).*$/\1 -L${libdir} -lvulkan-1/' "$FFBUILD_DESTPREFIX"/lib/pkgconfig/vulkan.pc
31-
elif [[ $TARGET == linux* ]]; then
32-
gen-implib "$FFBUILD_DESTPREFIX"/lib/libvulkan{.so.1,.a}
33-
rm "$FFBUILD_DESTPREFIX"/lib/libvulkan.so*
34-
35-
sed -i -e 's/^\(Libs:\).*$/\1 -L${libdir} -lvulkan/' "$FFBUILD_DESTPREFIX"/lib/pkgconfig/vulkan.pc
36-
else
37-
echo "Unsupported target"
38-
exit 1
39-
fi
4027
}
4128

4229
ffbuild_configure() {

0 commit comments

Comments
 (0)