Mesa (master): postprocess: move second temporary assertion into isolated configuration

Brian Paul brianp at kemper.freedesktop.org
Wed Jul 3 15:20:56 UTC 2013


Module: Mesa
Branch: master
Commit: 012ba47076dbc80742d4755f5c39909d0c4753f3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=012ba47076dbc80742d4755f5c39909d0c4753f3

Author: Matthew McClure <mcclurem at vmware.com>
Date:   Mon Jul  1 14:03:37 2013 -0700

postprocess: move second temporary assertion into isolated configuration

With this patch we will only assert that the second temporary is allocated,
when there are more than two active filters.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66423

Signed-off-by: Brian Paul <brianp at vmware.com>

---

 src/gallium/auxiliary/postprocess/pp_run.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/postprocess/pp_run.c b/src/gallium/auxiliary/postprocess/pp_run.c
index 9bd977b..0d95c72 100644
--- a/src/gallium/auxiliary/postprocess/pp_run.c
+++ b/src/gallium/auxiliary/postprocess/pp_run.c
@@ -53,8 +53,7 @@ pp_run(struct pp_queue_t *ppq, struct pipe_resource *in,
 
    assert(ppq->pp_queue);
    assert(ppq->tmp[0]);
-   assert(ppq->tmp[1]);
- 
+
    if (in->width0 != ppq->p->framebuffer.width ||
        in->height0 != ppq->p->framebuffer.height) {
       pp_debug("Resizing the temp pp buffers\n");
@@ -120,6 +119,7 @@ pp_run(struct pp_queue_t *ppq, struct pipe_resource *in,
 
       break;
    default:                    /* Two temp bufs */
+      assert(ppq->tmp[1]);
       ppq->pp_queue[0] (ppq, in, ppq->tmp[0], 0);
 
       for (i = 1; i < (ppq->n_filters - 1); i++) {




More information about the mesa-commit mailing list