diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-03 09:16:19 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-03 09:16:19 +0100 |
| commit | 17464545a9abdd19312065a578d1f69a6b0b015f (patch) | |
| tree | d39fde94a445ddde95399d4850ffbbbd357a3a19 /mesalib/src/glsl/ir_validate.cpp | |
| parent | eba14241fe23d0561687a1e530a57fa0bfc6ab69 (diff) | |
| parent | b8da71ffb17d3d16706db04115e9ba1dd8bc49b9 (diff) | |
| download | vcxsrv-17464545a9abdd19312065a578d1f69a6b0b015f.tar.gz vcxsrv-17464545a9abdd19312065a578d1f69a6b0b015f.tar.bz2 vcxsrv-17464545a9abdd19312065a578d1f69a6b0b015f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012
Diffstat (limited to 'mesalib/src/glsl/ir_validate.cpp')
| -rw-r--r-- | mesalib/src/glsl/ir_validate.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/glsl/ir_validate.cpp b/mesalib/src/glsl/ir_validate.cpp index af0b5768a..ad57a3149 100644 --- a/mesalib/src/glsl/ir_validate.cpp +++ b/mesalib/src/glsl/ir_validate.cpp @@ -120,7 +120,7 @@ ir_visitor_status ir_validate::visit_leave(ir_loop *ir) { if (ir->counter != NULL) { - if ((ir->from == NULL) || (ir->from == NULL) || (ir->increment == NULL)) { + if ((ir->from == NULL) || (ir->to == NULL) || (ir->increment == NULL)) { printf("ir_loop has invalid loop controls:\n" " counter: %p\n" " from: %p\n" @@ -136,7 +136,7 @@ ir_validate::visit_leave(ir_loop *ir) abort(); } } else { - if ((ir->from != NULL) || (ir->from != NULL) || (ir->increment != NULL)) { + if ((ir->from != NULL) || (ir->to != NULL) || (ir->increment != NULL)) { printf("ir_loop has invalid loop controls:\n" " counter: %p\n" " from: %p\n" |