Mesa (master): swr: [rasterizer jitter] fix llvm >= 5.0 build break

Tim Rowley torowley at kemper.freedesktop.org
Wed Mar 22 18:55:27 UTC 2017


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

Author: Tim Rowley <timothy.o.rowley at intel.com>
Date:   Tue Mar 21 11:42:31 2017 -0500

swr: [rasterizer jitter] fix llvm >= 5.0 build break

Function::getArgumentList() doesn't exist anymore, switch to using
arg_begin() (existed back to at least llvm-3.6.0).

Reviewed-by: Vedran Miletić <vedran at miletic.net>
CC: <mesa-stable at lists.freedesktop.org>

---

 src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp     | 2 +-
 src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp     | 2 +-
 src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp b/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp
index 1c2c8df197..5daeea95d1 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp
@@ -542,7 +542,7 @@ struct BlendJit : public Builder
         IRB()->SetInsertPoint(entry);
 
         // arguments
-        auto argitr = blendFunc->getArgumentList().begin();
+        auto argitr = blendFunc->arg_begin();
         Value* pBlendState = &*argitr++;
         pBlendState->setName("pBlendState");
         Value* pSrc = &*argitr++;
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
index d8eb5309d7..8fc31ae9c6 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
@@ -99,7 +99,7 @@ Function* FetchJit::Create(const FETCH_COMPILE_STATE& fetchState)
 
     IRB()->SetInsertPoint(entry);
 
-    auto    argitr = fetch->getArgumentList().begin();
+    auto    argitr = fetch->arg_begin();
 
     // Fetch shader arguments
     mpFetchInfo = &*argitr; ++argitr;
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp b/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp
index 494d8cfc89..2c19321fb3 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp
@@ -285,7 +285,7 @@ struct StreamOutJit : public Builder
         IRB()->SetInsertPoint(entry);
 
         // arguments
-        auto argitr = soFunc->getArgumentList().begin();
+        auto argitr = soFunc->arg_begin();
         Value* pSoCtx = &*argitr++;
         pSoCtx->setName("pSoCtx");
 




More information about the mesa-commit mailing list