diff options
| author | Marek Olšák <maraeo@gmail.com> | 2011-03-07 22:57:54 +0100 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2011-03-11 21:39:30 +0100 |
| commit | bfe88e69988b3d3bdff0b9f6051d0428e1315653 (patch) | |
| tree | d558baed61726a1401254fc62a5bd163eb0030da /src/mesa | |
| parent | 25485f4b69447514ab8b595aced90c75606a99bd (diff) | |
gallium: cleanup fence_signalled and fence_finish
So that they don't have the driver-specific param and return type.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_flush.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_syncobj.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_cb_flush.c b/src/mesa/state_tracker/st_cb_flush.c index 35ab00f6d0..ce902231ef 100644 --- a/src/mesa/state_tracker/st_cb_flush.c +++ b/src/mesa/state_tracker/st_cb_flush.c @@ -103,7 +103,7 @@ void st_finish( struct st_context *st ) st_flush(st, PIPE_FLUSH_RENDER_CACHE | PIPE_FLUSH_FRAME, &fence); if(fence) { - st->pipe->screen->fence_finish(st->pipe->screen, fence, 0, + st->pipe->screen->fence_finish(st->pipe->screen, fence, PIPE_TIMEOUT_INFINITE); st->pipe->screen->fence_reference(st->pipe->screen, &fence, NULL); } diff --git a/src/mesa/state_tracker/st_cb_syncobj.c b/src/mesa/state_tracker/st_cb_syncobj.c index 85aad08cc7..450909cf18 100644 --- a/src/mesa/state_tracker/st_cb_syncobj.c +++ b/src/mesa/state_tracker/st_cb_syncobj.c @@ -80,7 +80,7 @@ static void st_check_sync(struct gl_context *ctx, struct gl_sync_object *obj) struct pipe_screen *screen = st_context(ctx)->pipe->screen; struct st_sync_object *so = (struct st_sync_object*)obj; - if (so->fence && screen->fence_signalled(screen, so->fence, 0) == 0) { + if (so->fence && screen->fence_signalled(screen, so->fence)) { screen->fence_reference(screen, &so->fence, NULL); so->b.StatusFlag = GL_TRUE; } @@ -97,7 +97,7 @@ static void st_client_wait_sync(struct gl_context *ctx, * already called when creating a fence. */ if (so->fence && - screen->fence_finish(screen, so->fence, 0, timeout) == 0) { + screen->fence_finish(screen, so->fence, timeout)) { screen->fence_reference(screen, &so->fence, NULL); so->b.StatusFlag = GL_TRUE; } |