Mesa (master): postprocess: simplify pp_free() code
Brian Paul
brianp at kemper.freedesktop.org
Mon Nov 18 15:58:07 UTC 2013
Module: Mesa
Branch: master
Commit: 401f2d6ea8d8068747b6f507e8a8907ad9f6fe71
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=401f2d6ea8d8068747b6f507e8a8907ad9f6fe71
Author: Brian Paul <brianp at vmware.com>
Date: Sat Nov 16 13:55:40 2013 -0700
postprocess: simplify pp_free() code
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
---
src/gallium/auxiliary/postprocess/pp_init.c | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/gallium/auxiliary/postprocess/pp_init.c b/src/gallium/auxiliary/postprocess/pp_init.c
index a49a23d..bbebb5c 100644
--- a/src/gallium/auxiliary/postprocess/pp_init.c
+++ b/src/gallium/auxiliary/postprocess/pp_init.c
@@ -169,11 +169,12 @@ pp_free(struct pp_queue_t *ppq)
{
unsigned int i, j;
- if (ppq) {
- pp_free_fbos(ppq);
- }
+ if (!ppq)
+ return;
- if (ppq && ppq->p) {
+ pp_free_fbos(ppq);
+
+ if (ppq->p) {
if (ppq->p->pipe && ppq->filters && ppq->shaders) {
for (i = 0; i < ppq->n_filters; i++) {
unsigned int filter = ppq->filters[i];
@@ -221,17 +222,15 @@ pp_free(struct pp_queue_t *ppq)
FREE(ppq->p);
}
- if (ppq) {
- /*
- * Handle partial initialization for common resource destruction
- * in the create path.
- */
- FREE(ppq->filters);
- FREE(ppq->shaders);
- FREE(ppq->pp_queue);
+ /*
+ * Handle partial initialization for common resource destruction
+ * in the create path.
+ */
+ FREE(ppq->filters);
+ FREE(ppq->shaders);
+ FREE(ppq->pp_queue);
- FREE(ppq);
- }
+ FREE(ppq);
pp_debug("Queue taken down.\n");
}
More information about the mesa-commit
mailing list