diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-08-14 00:20:52 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-08-14 00:20:52 +1000 |
| commit | 56f5c0c001c476b813c94d071ac880fbe8d9768b (patch) | |
| tree | 257e2d7c3870a741ad30ea7bc38621d9eb728483 /src/gallium/auxiliary/gallivm/instructions.h | |
| parent | df4228deddea36b9d5b41ea395a216137e046205 (diff) | |
| parent | d8be393cb60d908f98f0edb74c1c7964e8f690fe (diff) | |
Merge remote branch 'origin/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 3a476928b6..d286ce80c7 100644 --- a/src/gallium/auxiliary/gallivm/instructions.h +++ b/src/gallium/auxiliary/gallivm/instructions.h @@ -79,7 +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 *kil(llvm::Value *in); llvm::Value *lerp(llvm::Value *in1, llvm::Value *in2, llvm::Value *in3); llvm::Value *lit(llvm::Value *in); |