Module: Mesa Branch: master Commit: 680071502ffe54c96ef9f458a9e1c668bb27fe76 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=680071502ffe54c96ef9f458a9e1c668bb27fe76
Author: José Fonseca <[email protected]> Date: Thu May 6 21:33:01 2010 +0100 llvmpipe: Fix fence wait. Avoids crashing when fence is NULL (LP_NUM_THREADS=0) and leaking when it is not. --- src/gallium/drivers/llvmpipe/lp_query.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_query.c b/src/gallium/drivers/llvmpipe/lp_query.c index a1836bb..c23e983 100644 --- a/src/gallium/drivers/llvmpipe/lp_query.c +++ b/src/gallium/drivers/llvmpipe/lp_query.c @@ -106,7 +106,10 @@ llvmpipe_begin_query(struct pipe_context *pipe, struct pipe_query *q) if (pq->binned) { struct pipe_fence_handle *fence; pipe->flush(pipe, PIPE_FLUSH_RENDER_CACHE, &fence); - pipe->screen->fence_finish(pipe->screen, fence, 0); + if (fence) { + pipe->screen->fence_finish(pipe->screen, fence, 0); + pipe->screen->fence_reference(pipe->screen, &fence, NULL); + } } lp_setup_begin_query(llvmpipe->setup, pq); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
