summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZack Rusin <zack@tungstengraphics.com>2007-10-26 19:53:53 -0400
committerKeith Whitwell <keith@tungstengraphics.com>2007-10-29 16:14:10 +0000
commitabe8cd19171def0de000e58b9f71c43adf4c6336 (patch)
tree2bbcc9314b0c11c97817d2655e7f6110cced6d13
parent3b25ce9eca9643a7a008735ec69c4e7ffddbe742 (diff)
Make sure the swizzling vector is being recreated for each function. This makes
GLSL bricks work.
-rw-r--r--src/mesa/pipe/llvm/storage.cpp1
-rw-r--r--src/mesa/pipe/llvm/storage.h9
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/pipe/llvm/storage.cpp b/src/mesa/pipe/llvm/storage.cpp
index 7300cdfef0..dca8b39958 100644
--- a/src/mesa/pipe/llvm/storage.cpp
+++ b/src/mesa/pipe/llvm/storage.cpp
@@ -383,6 +383,7 @@ void Storage::pushTemps()
}
++i;
}
+ m_extSwizzleVec = 0;
}
void Storage::popTemps()
diff --git a/src/mesa/pipe/llvm/storage.h b/src/mesa/pipe/llvm/storage.h
index eeadaa0506..ac3e4d5af9 100644
--- a/src/mesa/pipe/llvm/storage.h
+++ b/src/mesa/pipe/llvm/storage.h
@@ -106,11 +106,6 @@ private:
llvm::VectorType *m_floatVecType;
llvm::VectorType *m_intVecType;
- llvm::Value *m_undefFloatVec;
- llvm::Value *m_undefIntVec;
-
- llvm::Value *m_extSwizzleVec;
-
char m_name[32];
int m_idx;
@@ -118,6 +113,10 @@ private:
std::map<int, bool > m_destWriteMap;
+ llvm::Value *m_undefFloatVec;
+ llvm::Value *m_undefIntVec;
+ llvm::Value *m_extSwizzleVec;
+
struct Args {
llvm::Value *out;
llvm::Value *in;