From b39bccbd4ed71e9585da4cf5acf7b887b2e90899 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sat, 5 Mar 2011 21:23:54 +0100 Subject: gallium: add timeout parameter to fence_finish This is a follow-up to the ARB_sync patch for st/mesa and completes the ARB_sync implementation. --- src/gallium/drivers/llvmpipe/lp_flush.c | 2 +- src/gallium/drivers/llvmpipe/lp_screen.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/gallium/drivers/llvmpipe') diff --git a/src/gallium/drivers/llvmpipe/lp_flush.c b/src/gallium/drivers/llvmpipe/lp_flush.c index 849db06acd..6118164b20 100644 --- a/src/gallium/drivers/llvmpipe/lp_flush.c +++ b/src/gallium/drivers/llvmpipe/lp_flush.c @@ -92,7 +92,7 @@ llvmpipe_finish( struct pipe_context *pipe, struct pipe_fence_handle *fence = NULL; llvmpipe_flush(pipe, 0, &fence, reason); if (fence) { - pipe->screen->fence_finish(pipe->screen, fence, 0); + pipe->screen->fence_finish(pipe->screen, fence, 0, PIPE_TIMEOUT_INFINITE); pipe->screen->fence_reference(pipe->screen, &fence, NULL); } } diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index edcfbfcfac..c600144a2d 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -365,7 +365,8 @@ llvmpipe_fence_signalled(struct pipe_screen *screen, static int llvmpipe_fence_finish(struct pipe_screen *screen, struct pipe_fence_handle *fence_handle, - unsigned flag) + unsigned flag, + uint64_t timeout) { struct lp_fence *f = (struct lp_fence *) fence_handle; -- cgit v1.2.3