diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-26 08:13:08 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-26 08:13:08 +0200 |
| commit | af2d8fb974d476eadcd3cde3baebd038f5750600 (patch) | |
| tree | 9e24173d3f3dacb518a614984d26eaf7e87c7598 /mesalib/src/glsl/linker.cpp | |
| parent | f6c8097ba5b5bb714185762dbd0ff9958d23e804 (diff) | |
| parent | 8d86f8c566c4181c846a872a5a2f88718e635a72 (diff) | |
| download | vcxsrv-af2d8fb974d476eadcd3cde3baebd038f5750600.tar.gz vcxsrv-af2d8fb974d476eadcd3cde3baebd038f5750600.tar.bz2 vcxsrv-af2d8fb974d476eadcd3cde3baebd038f5750600.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig pixman mesa git update 26 oct 2012
Diffstat (limited to 'mesalib/src/glsl/linker.cpp')
| -rw-r--r-- | mesalib/src/glsl/linker.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp index 34ce13372..86371b5e6 100644 --- a/mesalib/src/glsl/linker.cpp +++ b/mesalib/src/glsl/linker.cpp @@ -882,6 +882,7 @@ move_non_declarations(exec_list *instructions, exec_node *last, assert(inst->as_assignment() || inst->as_call() + || inst->as_if() /* for initializers with the ?: operator */ || ((var != NULL) && (var->mode == ir_var_temporary))); if (make_copies) { |