Skip to content

[ET-VK][ez] Do not allow using glslc from Android NDK #14593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[ET-VK][ez] Do not allow using glslc from Android NDK #14593

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions backends/vulkan/cmake/ShaderLibrary.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,17 @@ if(NOT EXECUTORCH_ROOT)
message("WARNING: EXECUTORCH_ROOT is not set! A failure is likely imminent.")
endif()

if(ANDROID)
if(NOT ANDROID_NDK)
message(FATAL_ERROR "ANDROID_NDK not set")
endif()

if(NOT GLSLC_PATH)
set(GLSLC_PATH
"${ANDROID_NDK}/shader-tools/${ANDROID_NDK_HOST_SYSTEM_NAME}/glslc"
)
endif()
else()
find_program(GLSLC_PATH glslc PATHS $ENV{PATH})
find_program(GLSLC_PATH glslc PATHS $ENV{PATH})

if(NOT GLSLC_PATH)
message(FATAL_ERROR "USE_VULKAN glslc not found")
endif()
if(NOT GLSLC_PATH)
message(
FATAL_ERROR
"glslc from the Vulkan SDK must be installed to build the Vulkan backend. "
"Please install the Vulkan SDK 1.4.321.0 or newer from "
"https://vulkan.lunarg.com/sdk/home and ensure that the glslc binary is in your PATH. "
"Note that the glslc distributed with the Android NDK is not compatible since it "
"does not support the GL_EXT_integer_dot_product extension. "
)
endif()

# Required to enable linking with --whole-archive
Expand Down
Loading