diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-28 17:43:20 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-28 17:43:20 +0100 |
| commit | f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd (patch) | |
| tree | afbeb028495328a2817aedbac7aae484a2c71a83 /mesalib/src/glsl/ir_clone.cpp | |
| parent | bf0cbcc1d00962ef2221cb4ceae87cc5ae737454 (diff) | |
| parent | cbfb19790917d271b8ca6156554b16acc802719f (diff) | |
| download | vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.tar.gz vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.tar.bz2 vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
X11/xtrans/Xtrans.c
Diffstat (limited to 'mesalib/src/glsl/ir_clone.cpp')
| -rw-r--r-- | mesalib/src/glsl/ir_clone.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mesalib/src/glsl/ir_clone.cpp b/mesalib/src/glsl/ir_clone.cpp index 311c992be..167b80c9f 100644 --- a/mesalib/src/glsl/ir_clone.cpp +++ b/mesalib/src/glsl/ir_clone.cpp @@ -265,10 +265,12 @@ ir_assignment::clone(void *mem_ctx, struct hash_table *ht) const if (this->condition) new_condition = this->condition->clone(mem_ctx, ht); - return new(mem_ctx) ir_assignment(this->lhs->clone(mem_ctx, ht), - this->rhs->clone(mem_ctx, ht), - new_condition, - this->write_mask); + ir_assignment *cloned = + new(mem_ctx) ir_assignment(this->lhs->clone(mem_ctx, ht), + this->rhs->clone(mem_ctx, ht), + new_condition); + cloned->write_mask = this->write_mask; + return cloned; } ir_function * |