diff options
| author | marha <marha@users.sourceforge.net> | 2014-07-01 09:29:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-07-01 09:29:23 +0200 |
| commit | b6fac85cb1bb78f48ed81aaf42ba6b840b2d6cad (patch) | |
| tree | 2cf97060ce44345489da6d1bcbbe568d2b2ea666 /mesalib/src/glsl/ir_hv_accept.cpp | |
| parent | ac314766fd4f60b8ee0346b7586c1a5a6f533e11 (diff) | |
| parent | cfc5bafcb2db8c6e05d7be6bb7315960be08c0d8 (diff) | |
| download | vcxsrv-b6fac85cb1bb78f48ed81aaf42ba6b840b2d6cad.tar.gz vcxsrv-b6fac85cb1bb78f48ed81aaf42ba6b840b2d6cad.tar.bz2 vcxsrv-b6fac85cb1bb78f48ed81aaf42ba6b840b2d6cad.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman git update 1 July 2014
Diffstat (limited to 'mesalib/src/glsl/ir_hv_accept.cpp')
| -rw-r--r-- | mesalib/src/glsl/ir_hv_accept.cpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/mesalib/src/glsl/ir_hv_accept.cpp b/mesalib/src/glsl/ir_hv_accept.cpp index 2a1f70e5b..3ca7a5887 100644 --- a/mesalib/src/glsl/ir_hv_accept.cpp +++ b/mesalib/src/glsl/ir_hv_accept.cpp @@ -405,12 +405,28 @@ ir_if::accept(ir_hierarchical_visitor *v) ir_visitor_status ir_emit_vertex::accept(ir_hierarchical_visitor *v) { - return v->visit(this); + ir_visitor_status s = v->visit_enter(this); + if (s != visit_continue) + return (s == visit_continue_with_parent) ? visit_continue : s; + + s = this->stream->accept(v); + if (s != visit_continue) + return (s == visit_continue_with_parent) ? visit_continue : s; + + return (s == visit_stop) ? s : v->visit_leave(this); } ir_visitor_status ir_end_primitive::accept(ir_hierarchical_visitor *v) { - return v->visit(this); + ir_visitor_status s = v->visit_enter(this); + if (s != visit_continue) + return (s == visit_continue_with_parent) ? visit_continue : s; + + s = this->stream->accept(v); + if (s != visit_continue) + return (s == visit_continue_with_parent) ? visit_continue : s; + + return (s == visit_stop) ? s : v->visit_leave(this); } |