Mesa (master): clover: Fix build after llvm r223802

Aaron Watry awatry at kemper.freedesktop.org
Wed Dec 10 01:42:12 UTC 2014


Module: Mesa
Branch: master
Commit: 25db8729dc53b60ee0caade5e797e99d6ad13fa3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=25db8729dc53b60ee0caade5e797e99d6ad13fa3

Author: Aaron Watry <awatry at gmail.com>
Date:   Tue Dec  9 19:28:50 2014 -0600

clover: Fix build after llvm r223802

Signed-off-by: Aaron Watry <awatry at gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>

---

 src/gallium/state_trackers/clover/llvm/invocation.cpp |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index cda447d..5265d10 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -281,7 +281,11 @@ namespace {
       }
 
       for (unsigned i = 0; i < kernel_node->getNumOperands(); ++i) {
+#if HAVE_LLVM >= 0x0306
+         kernels.push_back(llvm::mdconst::dyn_extract<llvm::Function>(
+#else
          kernels.push_back(llvm::dyn_cast<llvm::Function>(
+#endif
                                     kernel_node->getOperand(i)->getOperand(0)));
       }
    }




More information about the mesa-commit mailing list