Mesa (master): draw: Clean up single-use goto statements.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Nov 11 18:54:34 UTC 2020
Module: Mesa
Branch: master
Commit: 904dcfd914ccacc4d7b834a8aa1a5699eb51d10e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=904dcfd914ccacc4d7b834a8aa1a5699eb51d10e
Author: Vinson Lee <vlee at freedesktop.org>
Date: Fri Oct 30 19:29:39 2020 -0700
draw: Clean up single-use goto statements.
Suggested-by: Ian Romanick <ian.d.romanick at intel.com>
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7389>
---
src/gallium/auxiliary/draw/draw_pipe_aaline.c | 29 +++++++++------------------
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git a/src/gallium/auxiliary/draw/draw_pipe_aaline.c b/src/gallium/auxiliary/draw/draw_pipe_aaline.c
index de6f970fe4b..71a84f29efd 100644
--- a/src/gallium/auxiliary/draw/draw_pipe_aaline.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_aaline.c
@@ -308,16 +308,11 @@ generate_aaline_fs(struct aaline_stage *aaline)
#endif
aaline->fs->aaline_fs = aaline->driver_create_fs_state(pipe, &aaline_fs);
- if (aaline->fs->aaline_fs == NULL)
- goto fail;
-
- aaline->fs->generic_attrib = transform.maxGeneric + 1;
- FREE((void *)aaline_fs.tokens);
- return TRUE;
+ if (aaline->fs->aaline_fs != NULL)
+ aaline->fs->generic_attrib = transform.maxGeneric + 1;
-fail:
FREE((void *)aaline_fs.tokens);
- return FALSE;
+ return aaline->fs->aaline_fs != NULL;
}
static boolean
@@ -336,13 +331,12 @@ generate_aaline_fs_nir(struct aaline_stage *aaline)
nir_lower_aaline_fs(aaline_fs.ir.nir, &aaline->fs->generic_attrib);
aaline->fs->aaline_fs = aaline->driver_create_fs_state(pipe, &aaline_fs);
if (aaline->fs->aaline_fs == NULL)
- goto fail;
+ return FALSE;
return TRUE;
-
-fail:
-#endif
+#else
return FALSE;
+#endif
}
/**
@@ -606,15 +600,12 @@ draw_aaline_stage(struct draw_context *draw)
aaline->stage.reset_stipple_counter = aaline_reset_stipple_counter;
aaline->stage.destroy = aaline_destroy;
- if (!draw_alloc_temp_verts(&aaline->stage, 8))
- goto fail;
+ if (!draw_alloc_temp_verts(&aaline->stage, 8)) {
+ aaline->stage.destroy(&aaline->stage);
+ return NULL;
+ }
return aaline;
-
- fail:
- aaline->stage.destroy(&aaline->stage);
-
- return NULL;
}
More information about the mesa-commit
mailing list