diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-18 08:30:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-18 08:30:48 +0200 |
| commit | c264407352572f07e31695637d3d78d07ae0bae8 (patch) | |
| tree | cf44f0d28a474db43950161c02bba835285ba383 /mesalib/src/glsl/ast_function.cpp | |
| parent | 369603df0452765724d3b53cd77a9f4bf3809fa1 (diff) | |
| parent | a3691edaff553b5130c97ff912ecaa96f08a6643 (diff) | |
| download | vcxsrv-c264407352572f07e31695637d3d78d07ae0bae8.tar.gz vcxsrv-c264407352572f07e31695637d3d78d07ae0bae8.tar.bz2 vcxsrv-c264407352572f07e31695637d3d78d07ae0bae8.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/ast_function.cpp')
| -rw-r--r-- | mesalib/src/glsl/ast_function.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesalib/src/glsl/ast_function.cpp b/mesalib/src/glsl/ast_function.cpp index 9e7c5995f..ea3282c5f 100644 --- a/mesalib/src/glsl/ast_function.cpp +++ b/mesalib/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, |