summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZack Rusin <zack@tungstengraphics.com>2007-10-20 16:59:37 -0400
committerZack Rusin <zack@tungstengraphics.com>2007-10-24 11:21:04 -0400
commit3b772a277fe032c94654648d0671ff42fd3fdce6 (patch)
treea322affe2d400b965dd7204400bcb729db9c5e19
parentd4d8d7c468c8ba45e302e163dd87b4e45426e1da (diff)
Make lit work but in a very lame way - will have to be rewritten.
-rw-r--r--src/mesa/pipe/llvm/instructions.cpp9
-rw-r--r--src/mesa/pipe/llvm/instructions.h1
-rw-r--r--src/mesa/pipe/llvm/llvmtgsi.cpp3
3 files changed, 3 insertions, 10 deletions
diff --git a/src/mesa/pipe/llvm/instructions.cpp b/src/mesa/pipe/llvm/instructions.cpp
index 3105c49bccc..5a40888696f 100644
--- a/src/mesa/pipe/llvm/instructions.cpp
+++ b/src/mesa/pipe/llvm/instructions.cpp
@@ -167,7 +167,7 @@ llvm::Value *Instructions::callFAbs(llvm::Value *val)
llvm::Value * Instructions::lit(llvm::Value *in)
{
-#if 1
+#if 0
printVector(in);
return in;
@@ -191,7 +191,7 @@ llvm::Value * Instructions::lit(llvm::Value *in)
m_llvmLit = makeLitFunction(m_mod);
}
CallInst *call = new CallInst(m_llvmLit, in, name("litres"), m_block);
- //call->setCallingConv(CallingConv::C);
+ call->setCallingConv(CallingConv::C);
call->setTailCall(false);
return call;
#endif
@@ -897,8 +897,3 @@ void Instructions::printVector(llvm::Value *val)
call->setCallingConv(CallingConv::C);
call->setTailCall(true);
}
-
-llvm::Value * Instructions::swizzleWrite(llvm::Value *in, int mask)
-{
-
-}
diff --git a/src/mesa/pipe/llvm/instructions.h b/src/mesa/pipe/llvm/instructions.h
index bb71cc8520f..87203fdc10b 100644
--- a/src/mesa/pipe/llvm/instructions.h
+++ b/src/mesa/pipe/llvm/instructions.h
@@ -34,7 +34,6 @@ public:
llvm::Value *rcp(llvm::Value *in);
llvm::Value *rsq(llvm::Value *in);
llvm::Value *sub(llvm::Value *in1, llvm::Value *in2);
- llvm::Value *swizzleWrite(llvm::Value *in, int mask);
void printVector(llvm::Value *val);
private:
diff --git a/src/mesa/pipe/llvm/llvmtgsi.cpp b/src/mesa/pipe/llvm/llvmtgsi.cpp
index 2a86a4e4425..049bf0fa6e7 100644
--- a/src/mesa/pipe/llvm/llvmtgsi.cpp
+++ b/src/mesa/pipe/llvm/llvmtgsi.cpp
@@ -184,8 +184,7 @@ translate_instruction(llvm::Module *module,
}
break;
case TGSI_OPCODE_LIT: {
- //out = instr->lit(inputs[0]);
- return;
+ out = instr->lit(inputs[0]);
}
break;
case TGSI_OPCODE_RCP: {