Mesa (master): draw: use common exit path in pipeline finish.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Jul 7 20:37:18 UTC 2020
Module: Mesa
Branch: master
Commit: b4802d6ea13bf547b6e5f9fd0e4059965bf2794a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b4802d6ea13bf547b6e5f9fd0e4059965bf2794a
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Jun 19 15:22:18 2020 +1000
draw: use common exit path in pipeline finish.
I need to add a missing free here, and it seems pointless duplication
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5555>
---
src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
index d9a5862e442..f2534709832 100644
--- a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
+++ b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
@@ -728,13 +728,7 @@ llvm_pipeline_generic(struct draw_pt_middle_end *middle,
if (prim_info->count == 0) {
debug_printf("GS/IA didn't emit any vertices!\n");
-
- FREE(vert_info->verts);
- if (free_prim_info) {
- FREE(tes_elts_out);
- FREE(prim_info->primitive_lengths);
- }
- return;
+ goto out;
}
draw_stats_clipper_primitives(draw, prim_info);
@@ -762,6 +756,7 @@ llvm_pipeline_generic(struct draw_pt_middle_end *middle,
emit( fpme->emit, vert_info, prim_info );
}
}
+out:
FREE(vert_info->verts);
if (free_prim_info) {
FREE(tes_elts_out);
More information about the mesa-commit
mailing list