Module: Mesa Branch: 12.0 Commit: a4cd90283a418cb5eee092365922cedacafaebdd URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a4cd90283a418cb5eee092365922cedacafaebdd
Author: Tim Rowley <[email protected]> Date: Wed Jul 6 16:26:16 2016 -0500 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]> (cherry picked from commit ae4f2c849a426c63b149ca5c8f4a293ee5ba751e) --- 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) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
