[Mesa-dev] [PATCH 1/1] clover: Fix build since clang r301442

[Francisco Jerez]

Jan Vesely <jan.vesely at rutgers.edu> writes:

> Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>
> ---
>  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 cee51b9..54ac579 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 default_ik = clang::InputKind::OpenCL;
>  #else
>           const auto lang_as_offset = clang::LangAS::Offset;
> +         const clang::InputKind default_ik = clang::IK_OpenCL;

"ik_opencl" seems like a better name for this, with that fixed:

Reviewed-by: Francisco Jerez <currojerez at riseup.net>

>  #endif
>  
>           inline void
> diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> index deebef5..c33580e 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::default_ik, ::llvm::Triple(target.triple),
>                                  c->getPreprocessorOpts(),
>                                  clang::LangStandard::lang_opencl11);
>  
> -- 
> 2.9.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 212 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170427/8c488d3b/attachment.sig>