diff options
| author | Marek Olšák <maraeo@gmail.com> | 2011-03-05 21:23:54 +0100 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2011-03-08 23:52:37 +0100 |
| commit | b39bccbd4ed71e9585da4cf5acf7b887b2e90899 (patch) | |
| tree | 8aafddda49b4d4e4cdf19ec76350583b7c4d41b4 /src/gallium/drivers/svga | |
| 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/svga')
| -rw-r--r-- | src/gallium/drivers/svga/svga_context.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_screen.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/svga/svga_context.c b/src/gallium/drivers/svga/svga_context.c index f0f875b2b2..e64dc94b9d 100644 --- a/src/gallium/drivers/svga/svga_context.c +++ b/src/gallium/drivers/svga/svga_context.c @@ -241,7 +241,8 @@ void svga_context_flush( struct svga_context *svga, if (SVGA_DEBUG & DEBUG_SYNC) { if (fence) - svga->pipe.screen->fence_finish( svga->pipe.screen, fence, 0); + svga->pipe.screen->fence_finish( svga->pipe.screen, fence, 0, + PIPE_TIMEOUT_INFINITE); } if(pfence) diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c index ef1d3098d5..f4029c7e36 100644 --- a/src/gallium/drivers/svga/svga_screen.c +++ b/src/gallium/drivers/svga/svga_screen.c @@ -425,7 +425,8 @@ svga_fence_signalled(struct pipe_screen *screen, static int svga_fence_finish(struct pipe_screen *screen, struct pipe_fence_handle *fence, - unsigned flag) + unsigned flag, + uint64_t timeout) { struct svga_winsys_screen *sws = svga_screen(screen)->sws; |