Module: Mesa Branch: master Commit: 3115687f9b9830417c408228db2bc679e346bba6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3115687f9b9830417c408228db2bc679e346bba6
Author: Jan Vesely <[email protected]> Date: Fri Sep 15 20:34:42 2017 -0400 clover: Fix build after LLVM r313390 v2: pass llvm context reference instead of a pointer Signed-off-by: Jan Vesely <[email protected]> Reviewed-by: Francisco Jerez <[email protected]> --- src/gallium/state_trackers/clover/llvm/compat.hpp | 10 ++++++++++ src/gallium/state_trackers/clover/llvm/invocation.cpp | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp b/src/gallium/state_trackers/clover/llvm/compat.hpp index b22ecfa6b2..23b111d710 100644 --- a/src/gallium/state_trackers/clover/llvm/compat.hpp +++ b/src/gallium/state_trackers/clover/llvm/compat.hpp @@ -198,6 +198,16 @@ namespace clover { f(mod.getError().message()); #endif } + + template<typename T> void + set_diagnostic_handler(::llvm::LLVMContext &ctx, + T *diagnostic_handler, void *data) { +#if HAVE_LLVM >= 0x0600 + ctx.setDiagnosticHandlerCallBack(diagnostic_handler, data); +#else + ctx.setDiagnosticHandler(diagnostic_handler, data); +#endif + } } } } diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp index 6412377faa..a373df4eac 100644 --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp @@ -89,7 +89,7 @@ namespace { create_context(std::string &r_log) { init_targets(); std::unique_ptr<LLVMContext> ctx { new LLVMContext }; - ctx->setDiagnosticHandler(diagnostic_handler, &r_log); + compat::set_diagnostic_handler(*ctx, diagnostic_handler, &r_log); return ctx; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
