[Mesa-dev] [PATCH] swr: [rasterizer jitter] fix llvm-3.7 compile

Tim Rowley timothy.o.rowley at intel.com
Wed Jul 6 21:41:06 UTC 2016


d3d97f8 broke llvm-3.7, which has a mismatched API for
setDataLayout/getDataLayout.
---
 src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
index 6e00a70..c6cbccf 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)
-- 
1.9.1



More information about the mesa-dev mailing list