diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-07-14 01:14:52 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-07-14 01:14:52 +1000 |
| commit | d68a3ebf0e7e853cf9680ddbb095fffe7c0fb1f9 (patch) | |
| tree | e093bba7d7b0ff62e0a4f47bd622180e5cea1a22 /src/gallium/auxiliary/gallivm/instructions.h | |
| parent | 1d50e26f4afc0c7cdcd843a1336a90cdfc76765b (diff) | |
| parent | 6410e94b966148dde81b5121e53a250d7b530d91 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/auxiliary/gallivm/instructions.h')
| -rw-r--r-- | src/gallium/auxiliary/gallivm/instructions.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/gallivm/instructions.h b/src/gallium/auxiliary/gallivm/instructions.h index 19ca84ddc6..3a476928b6 100644 --- a/src/gallium/auxiliary/gallivm/instructions.h +++ b/src/gallium/auxiliary/gallivm/instructions.h @@ -85,7 +85,7 @@ public: llvm::Value *lit(llvm::Value *in); llvm::Value *lg2(llvm::Value *in); llvm::Value *madd(llvm::Value *in1, llvm::Value *in2, - llvm::Value *in2); + llvm::Value *in3); llvm::Value *min(llvm::Value *in1, llvm::Value *in2); llvm::Value *max(llvm::Value *in1, llvm::Value *in2); llvm::Value *mul(llvm::Value *in1, llvm::Value *in2); |