The opencl 1.0 langstandard was renamed in 5.0+
v2: Move preprocessor check into compat.hpp
Cc: Mark Janes <mark.a.ja...@intel.com>
Cc: Francisco Jerez <curroje...@riseup.net>
---
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 19528a0133..2e070b2eef 100644
--- a/src/gallium/state_trackers/clover/llvm/compat.hpp
+++ b/src/gallium/state_trackers/clover/llvm/compat.hpp
@@ -89,8 +89,10 @@ namespace clover {
#if 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;
+ const clang::LangStandard::Kind lang_opencl10 =
clang::LangStandard::lang_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 af78c2ae28..b2c64bc48f 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -85,7 +85,7 @@ namespace {
};
const clc_version_lang_std cl_version_lang_stds[] = {
- { 100, clang::LangStandard::lang_opencl10},
+ { 100, compat::lang_opencl10},
{ 110, clang::LangStandard::lang_opencl11},
{ 120, clang::LangStandard::lang_opencl12},
{ 200, clang::LangStandard::lang_opencl20},
--
2.14.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
