Mesa (master): draw: use float version of LLVM Mul/Add instructions
Brian Paul
brianp at kemper.freedesktop.org
Wed Oct 20 20:57:05 UTC 2010
Module: Mesa
Branch: master
Commit: c492066071c17e55740f3eed69b3344e6f1793ff
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c492066071c17e55740f3eed69b3344e6f1793ff
Author: Brian Paul <brianp at vmware.com>
Date: Wed Oct 20 14:54:38 2010 -0600
draw: use float version of LLVM Mul/Add instructions
LLVM 2.8 is pickier about int vs float instructions and operands.
---
src/gallium/auxiliary/draw/draw_llvm.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c
index f8fd17f..3f14571 100644
--- a/src/gallium/auxiliary/draw/draw_llvm.c
+++ b/src/gallium/auxiliary/draw/draw_llvm.c
@@ -835,11 +835,11 @@ generate_viewport(struct draw_llvm *llvm,
trans = vec4f_from_scalar(builder, LLVMBuildLoad(builder, trans_i, ""), "trans");
/* divide by w */
- out = LLVMBuildMul(builder, out, out3, "");
+ out = LLVMBuildFMul(builder, out, out3, "");
/* mult by scale */
- out = LLVMBuildMul(builder, out, scale, "");
+ out = LLVMBuildFMul(builder, out, scale, "");
/* add translation */
- out = LLVMBuildAdd(builder, out, trans, "");
+ out = LLVMBuildFAdd(builder, out, trans, "");
/* store transformed outputs */
LLVMBuildStore(builder, out, outputs[0][i]);
@@ -947,27 +947,27 @@ generate_clipmask(LLVMBuilderRef builder,
plane_ptr = LLVMBuildGEP(builder, planes_ptr, indices, 3, "");
plane1 = LLVMBuildLoad(builder, plane_ptr, "plane_x");
planes = vec4f_from_scalar(builder, plane1, "plane4_x");
- sum = LLVMBuildMul(builder, planes, pos_x, "");
+ sum = LLVMBuildFMul(builder, planes, pos_x, "");
indices[2] = LLVMConstInt(LLVMInt32Type(), 1, 0);
plane_ptr = LLVMBuildGEP(builder, planes_ptr, indices, 3, "");
plane1 = LLVMBuildLoad(builder, plane_ptr, "plane_y");
planes = vec4f_from_scalar(builder, plane1, "plane4_y");
- test = LLVMBuildMul(builder, planes, pos_y, "");
+ test = LLVMBuildFMul(builder, planes, pos_y, "");
sum = LLVMBuildFAdd(builder, sum, test, "");
indices[2] = LLVMConstInt(LLVMInt32Type(), 2, 0);
plane_ptr = LLVMBuildGEP(builder, planes_ptr, indices, 3, "");
plane1 = LLVMBuildLoad(builder, plane_ptr, "plane_z");
planes = vec4f_from_scalar(builder, plane1, "plane4_z");
- test = LLVMBuildMul(builder, planes, pos_z, "");
+ test = LLVMBuildFMul(builder, planes, pos_z, "");
sum = LLVMBuildFAdd(builder, sum, test, "");
indices[2] = LLVMConstInt(LLVMInt32Type(), 3, 0);
plane_ptr = LLVMBuildGEP(builder, planes_ptr, indices, 3, "");
plane1 = LLVMBuildLoad(builder, plane_ptr, "plane_w");
planes = vec4f_from_scalar(builder, plane1, "plane4_w");
- test = LLVMBuildMul(builder, planes, pos_w, "");
+ test = LLVMBuildFMul(builder, planes, pos_w, "");
sum = LLVMBuildFAdd(builder, sum, test, "");
test = lp_build_compare(builder, f32_type, PIPE_FUNC_GREATER, zero, sum);
More information about the mesa-commit
mailing list