Skip to content

Commit edc0847

Browse files
authored
Arm backend: tweak setup.sh --enable-vulkan-sdk (#14058)
Check if glscl command is available and if so skip Vulkan SDK download. Else download and bail out if "glscl --version" fails,
1 parent 34b6a2d commit edc0847

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

backends/arm/scripts/vulkan_utils.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ else
3636
fi
3737

3838
function setup_vulkan_sdk() {
39-
40-
if command -v vulkaninfo > /dev/null 2>&1; then
41-
echo "[${FUNCNAME[0]}] Vulkan SDK already installed..."
39+
if command -v glslc > /dev/null 2>&1; then
40+
echo "[${FUNCNAME[0]}] GLSL already installed, no need to get Vulkan SDK..."
4241
enable_vulkan_sdk=0
4342
return
4443
fi
@@ -57,10 +56,11 @@ function setup_vulkan_sdk() {
5756
tar -C ${vulkan_sdk_base_dir} -xJf "${vulkan_sdk_tar_file}"
5857

5958
vulkan_sdk_bin_path="$(cd ${vulkan_sdk_bin_dir} && pwd)"
60-
if ${vulkan_sdk_bin_path}/vulkaninfo > /dev/null 2>&1; then
61-
echo "[${FUNCNAME[0]}] Vulkan SDK OK"
59+
if ${vulkan_sdk_bin_path}/glslc --version > /dev/null 2>&1; then
60+
echo "[${FUNCNAME[0]}] Vulkan SDK install (GLSL) OK"
6261
else
63-
echo "[${FUNCNAME[0]}] Vulkan SDK NOK - perhaps need manual install of swifthshader or mesa-vulkan driver?"
62+
echo "[${FUNCNAME[0]}] Vulkan SDK install NOK - glslc returned error"
63+
${vulkan_sdk_bin_path}/glslc --version
6464
exit 1
6565
fi
6666
}

0 commit comments

Comments
 (0)