From 9d80ed0862154dba17fd558dd16b62e6bf43515f Mon Sep 17 00:00:00 2001 From: George Kyriazis Date: Fri, 19 Jan 2018 16:46:56 -0600 Subject: [PATCH] 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 --- 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 a9a416a..93e3240 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 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 -- 2.7.4