diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-16 11:30:08 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-16 11:30:08 +0200 |
| commit | 56e12b1310b1b52d00bc27e919d915255af5bf03 (patch) | |
| tree | 19379a18fe9a678a109397837339820892101e4b /mesalib/src/glsl/ir.cpp | |
| parent | c5883f8af060c0a300a29e732e8bb893bc8e0eca (diff) | |
| parent | 9e23b44bfe1e6e85231b1c07d945cadf0c868648 (diff) | |
| download | vcxsrv-56e12b1310b1b52d00bc27e919d915255af5bf03.tar.gz vcxsrv-56e12b1310b1b52d00bc27e919d915255af5bf03.tar.bz2 vcxsrv-56e12b1310b1b52d00bc27e919d915255af5bf03.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libxcb libxcb/xcb-proto xserver mesa pixman xkbcomp git update 16 oct 2013
Conflicts:
mesalib/src/mesa/drivers/dri/common/drisw_util.c
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'mesalib/src/glsl/ir.cpp')
| -rw-r--r-- | mesalib/src/glsl/ir.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp index ae67d6bdd..de9613e8f 100644 --- a/mesalib/src/glsl/ir.cpp +++ b/mesalib/src/glsl/ir.cpp @@ -398,6 +398,9 @@ ir_expression::ir_expression(int op, ir_rvalue *op0, ir_rvalue *op1) this->type = glsl_type::uint_type; break; + case ir_binop_imul_high: + case ir_binop_carry: + case ir_binop_borrow: case ir_binop_lshift: case ir_binop_rshift: case ir_binop_bfm: @@ -527,7 +530,10 @@ static const char *const operator_strs[] = { "+", "-", "*", + "imul_high", "/", + "carry", + "borrow", "%", "<", ">", @@ -1578,7 +1584,8 @@ ir_swizzle::variable_referenced() const ir_variable::ir_variable(const struct glsl_type *type, const char *name, ir_variable_mode mode) - : max_array_access(0), read_only(false), centroid(false), invariant(false), + : max_array_access(0), max_ifc_array_access(NULL), + read_only(false), centroid(false), invariant(false), mode(mode), interpolation(INTERP_QUALIFIER_NONE) { this->ir_type = ir_type_variable; |