Module: Mesa Branch: master Commit: 702dc43f7eda025103df8adaf9a57067f8f56f87 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=702dc43f7eda025103df8adaf9a57067f8f56f87
Author: Ian Romanick <ian.d.roman...@intel.com> Date: Fri Jan 5 18:19:42 2018 -0800 glsl: Don't handle visit_stop in several ::accept methods All cases where the result could be non-visit_continue would have already returned. CID: 401351, 1224465, 1224466 Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> Reviewed-by: Alejandro PiƱeiro <apinhe...@igalia.com> --- src/compiler/glsl/ir_hv_accept.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/compiler/glsl/ir_hv_accept.cpp b/src/compiler/glsl/ir_hv_accept.cpp index bf3f3d4f04..f04a5b6fd1 100644 --- a/src/compiler/glsl/ir_hv_accept.cpp +++ b/src/compiler/glsl/ir_hv_accept.cpp @@ -230,7 +230,8 @@ ir_texture::accept(ir_hierarchical_visitor *v) break; } - return (s == visit_stop) ? s : v->visit_leave(this); + assert(s == visit_continue); + return v->visit_leave(this); } @@ -414,7 +415,8 @@ ir_emit_vertex::accept(ir_hierarchical_visitor *v) if (s != visit_continue) return (s == visit_continue_with_parent) ? visit_continue : s; - return (s == visit_stop) ? s : v->visit_leave(this); + assert(s == visit_continue); + return v->visit_leave(this); } @@ -429,7 +431,8 @@ ir_end_primitive::accept(ir_hierarchical_visitor *v) if (s != visit_continue) return (s == visit_continue_with_parent) ? visit_continue : s; - return (s == visit_stop) ? s : v->visit_leave(this); + assert(s == visit_continue); + return v->visit_leave(this); } ir_visitor_status _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit