Module: Mesa Branch: master Commit: 6b8269d0bbded7a42cd2de2b50d077cf12157d15 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b8269d0bbded7a42cd2de2b50d077cf12157d15
Author: Jan Vesely <[email protected]> Date: Tue Aug 6 12:24:18 2019 -0400 clover: Fix build after clang r367864 v2: Drop special case of llvm-9 Signed-off-by: Jan Vesely <[email protected]> Acked-by: Dieter Nützel <[email protected]> Tested-by: Dieter Nützel <[email protected]> Reviewed-by: Aaron Watry <[email protected]> --- src/gallium/state_trackers/clover/llvm/compat.hpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp b/src/gallium/state_trackers/clover/llvm/compat.hpp index 0ecf622a9af..b040902fcfe 100644 --- a/src/gallium/state_trackers/clover/llvm/compat.hpp +++ b/src/gallium/state_trackers/clover/llvm/compat.hpp @@ -79,11 +79,17 @@ namespace clover { #endif } -#if HAVE_LLVM >= 0x0500 +#if HAVE_LLVM >= 0x1000 + const clang::InputKind ik_opencl = clang::Language::OpenCL; +#elif HAVE_LLVM >= 0x0500 const clang::InputKind ik_opencl = clang::InputKind::OpenCL; - const clang::LangStandard::Kind lang_opencl10 = clang::LangStandard::lang_opencl10; #else const clang::InputKind ik_opencl = clang::IK_OpenCL; +#endif + +#if HAVE_LLVM >= 0x0500 + const clang::LangStandard::Kind lang_opencl10 = clang::LangStandard::lang_opencl10; +#else const clang::LangStandard::Kind lang_opencl10 = clang::LangStandard::lang_opencl; #endif _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
