diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-12 13:11:19 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-12 13:11:19 +1100 |
| commit | 58915980127ab4e57b6b40a8c42f44be4a12aeae (patch) | |
| tree | 176f379bb19fc8caacf96112a1ebeda8aea90a16 /src/mesa/pipe/llvm/instructions.h | |
| parent | e282d22d512d2a5871d0fabb7d855a16b4593c50 (diff) | |
| parent | b2ad30d57197c2167789e4f3f5b34af6df56dde2 (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Conflicts:
src/mesa/pipe/Makefile
Diffstat (limited to 'src/mesa/pipe/llvm/instructions.h')
| -rw-r--r-- | src/mesa/pipe/llvm/instructions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/pipe/llvm/instructions.h b/src/mesa/pipe/llvm/instructions.h index e9bfc9d740..9ebc17dd8e 100644 --- a/src/mesa/pipe/llvm/instructions.h +++ b/src/mesa/pipe/llvm/instructions.h @@ -62,8 +62,7 @@ public: void beginLoop(); void bgnSub(unsigned); void brk(); - void cal(int label, llvm::Value *out, llvm::Value *in, - llvm::Value *cst, llvm::Value *tmp); + void cal(int label, llvm::Value *input); llvm::Value *cmp(llvm::Value *in1, llvm::Value *in2, llvm::Value *in3); llvm::Value *cos(llvm::Value *in); llvm::Value *cross(llvm::Value *in1, llvm::Value *in2); @@ -80,6 +79,7 @@ public: llvm::Value *floor(llvm::Value *in); llvm::Value *frc(llvm::Value *in); void ifop(llvm::Value *in); + llvm::Value *kilp(llvm::Value *in); llvm::Value *lerp(llvm::Value *in1, llvm::Value *in2, llvm::Value *in3); llvm::Value *lit(llvm::Value *in); |