summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorTim Rowley <[email protected]>2016-07-06 16:26:16 -0500
committerTim Rowley <[email protected]>2016-07-12 10:42:57 -0500
commitae4f2c849a426c63b149ca5c8f4a293ee5ba751e (patch)
tree72a2d632e488f3b97dd6cedd7127c7d6fae1b0de /src/gallium
parentd46489ddea3dfd1d895e0020222cb1c41ba52068 (diff)
swr: [rasterizer jitter] fix llvm-3.7 compile
d3d97f8 broke llvm-3.7, which has a mismatched API for setDataLayout/getDataLayout. Signed-off-by: Tim Rowley <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
index 6e00a70c887..c6cbccf094a 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
@@ -241,7 +241,12 @@ bool JitManager::SetupModuleFromIR(const uint8_t *pIR)
return false;
}
+#if HAVE_LLVM == 0x307
+ // llvm-3.7 has mismatched setDataLyout/getDataLayout APIs
+ newModule->setDataLayout(*mpExec->getDataLayout());
+#else
newModule->setDataLayout(mpExec->getDataLayout());
+#endif
mpCurrentModule = newModule.get();
#if defined(_WIN32)