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/ir.h | |
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/ir.h')
-rw-r--r-- | mesalib/src/glsl/ir.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h index 55535b2f5..014f3630d 100644 --- a/mesalib/src/glsl/ir.h +++ b/mesalib/src/glsl/ir.h @@ -896,6 +896,7 @@ enum ir_expression_operation { ir_unop_exp2, ir_unop_log2, ir_unop_f2i, /**< Float-to-integer conversion. */ + ir_unop_f2u, /**< Float-to-unsigned conversion. */ ir_unop_i2f, /**< Integer-to-float conversion. */ ir_unop_f2b, /**< Float-to-boolean conversion */ ir_unop_b2f, /**< Boolean-to-float conversion */ |