summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Berry <[email protected]>2012-06-13 15:50:23 -0700
committerPaul Berry <[email protected]>2012-06-15 08:58:55 -0700
commit4d9c3cbce9e1ff45e5a90dda4de4934599b88037 (patch)
tree9dfddcffbbbcdff2c365205788c54b5ddb74a6a7
parent9d57d483cbcced5051d0dd4d48bbe750b5c15592 (diff)
glsl: Use ir_unop_f2u to convert floats to uints.
Fixes piglit tests spec/glsl-1.30/execution/{vs,fs}-float-uint-conversion on i965. Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r--src/glsl/ast_function.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index 9e7c5995fc9..ea3282c5f94 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
@@ -452,8 +452,7 @@ convert_component(ir_rvalue *src, const glsl_type *desired_type)
result = new(ctx) ir_expression(ir_unop_i2u, src);
break;
case GLSL_TYPE_FLOAT:
- result = new(ctx) ir_expression(ir_unop_i2u,
- new(ctx) ir_expression(ir_unop_f2i, src));
+ result = new(ctx) ir_expression(ir_unop_f2u, src);
break;
case GLSL_TYPE_BOOL:
result = new(ctx) ir_expression(ir_unop_i2u,