diff options
| author | Marek Olšák <[email protected]> | 2011-03-05 21:23:54 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2011-03-08 23:52:37 +0100 |
| commit | b39bccbd4ed71e9585da4cf5acf7b887b2e90899 (patch) | |
| tree | 8aafddda49b4d4e4cdf19ec76350583b7c4d41b4 /src/gallium/drivers/softpipe | |
| parent | 5257a6dbc65d742e6d0fcf4278a4157b2f39fdf7 (diff) | |
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.
Diffstat (limited to 'src/gallium/drivers/softpipe')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_fence.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_flush.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/softpipe/sp_fence.c b/src/gallium/drivers/softpipe/sp_fence.c index 66c52141132..40d0b5970ef 100644 --- a/src/gallium/drivers/softpipe/sp_fence.c +++ b/src/gallium/drivers/softpipe/sp_fence.c @@ -54,7 +54,8 @@ softpipe_fence_signalled(struct pipe_screen *screen, static int softpipe_fence_finish(struct pipe_screen *screen, struct pipe_fence_handle *fence, - unsigned flags) + unsigned flags, + uint64_t timeout) { assert(!fence); return 0; diff --git a/src/gallium/drivers/softpipe/sp_flush.c b/src/gallium/drivers/softpipe/sp_flush.c index 6f7addd441a..00a2fafdfa2 100644 --- a/src/gallium/drivers/softpipe/sp_flush.c +++ b/src/gallium/drivers/softpipe/sp_flush.c @@ -162,7 +162,8 @@ softpipe_flush_resource(struct pipe_context *pipe, * This is for illustrative purposes only, as softpipe does not * have fences. */ - 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); } } else { |