Mesa (master): swr/rast: Fix llvm5 behavior

George Kyriazis gkyriazis at kemper.freedesktop.org
Fri Jan 19 23:08:53 UTC 2018


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

Author: George Kyriazis <george.kyriazis at intel.com>
Date:   Fri Jan 19 16:46:56 2018 -0600

swr/rast: Fix llvm5 behavior

For some reason llvm5 is picky about accepting a void * type in the
case of building an argument list.

Since we don't care about the type (we ignore the argument for now),
pick another pointer type

Reviewed-by: Bruce Cherniak <bruce.cherniak at intel.com>

---

 src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
index a9a416a7de..93e3240612 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
@@ -128,7 +128,8 @@ JitManager::JitManager(uint32_t simdWidth, const char *arch, const char* core)
 #endif
     std::vector<Type*> fsArgs;
 
-    fsArgs.push_back(PointerType::get(Type::getVoidTy(mContext), 0));
+    // llvm5 is picky and does not take a void * type
+    fsArgs.push_back(PointerType::get(Gen_SWR_FETCH_CONTEXT(this), 0));
 
     fsArgs.push_back(PointerType::get(Gen_SWR_FETCH_CONTEXT(this), 0));
 #if USE_SIMD16_SHADERS




More information about the mesa-commit mailing list