Module: Mesa Branch: master Commit: b295a528362239e4500c89e94e0af0cc78b896c1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b295a528362239e4500c89e94e0af0cc78b896c1
Author: Jan Vesely <[email protected]> Date: Thu Apr 27 12:11:37 2017 -0400 clover: Fix build since clang r301442 v2: rename default_ik -> ik_opencl Signed-off-by: Jan Vesely <[email protected]> Reviewed-by: Francisco Jerez <[email protected]> --- src/gallium/state_trackers/clover/llvm/compat.hpp | 2 ++ src/gallium/state_trackers/clover/llvm/invocation.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp b/src/gallium/state_trackers/clover/llvm/compat.hpp index cee51b9dd1..06d3b6ffe6 100644 --- a/src/gallium/state_trackers/clover/llvm/compat.hpp +++ b/src/gallium/state_trackers/clover/llvm/compat.hpp @@ -70,8 +70,10 @@ namespace clover { #if HAVE_LLVM >= 0x0500 const auto lang_as_offset = 0; + const clang::InputKind ik_opencl = clang::InputKind::OpenCL; #else const auto lang_as_offset = clang::LangAS::Offset; + const clang::InputKind ik_opencl = clang::IK_OpenCL; #endif inline void diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp index deebef5726..6412377faa 100644 --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp @@ -126,7 +126,7 @@ namespace { c->getDiagnosticOpts().ShowCarets = false; compat::set_lang_defaults(c->getInvocation(), c->getLangOpts(), - clang::IK_OpenCL, ::llvm::Triple(target.triple), + compat::ik_opencl, ::llvm::Triple(target.triple), c->getPreprocessorOpts(), clang::LangStandard::lang_opencl11); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
