diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-08-06 16:41:42 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-08-10 01:11:10 +0200 |
| commit | 54272e18a682c8b82d4a86b2c07b51c303d8cead (patch) | |
| tree | c9c0ac7ad2fb4144ebeb9c7851eaa19a8103973c /src/mesa/state_tracker | |
| parent | c6043e7d54fc48771856a50235f9141b711151f3 (diff) | |
| download | external_mesa3d-54272e18a682c8b82d4a86b2c07b51c303d8cead.zip external_mesa3d-54272e18a682c8b82d4a86b2c07b51c303d8cead.tar.gz external_mesa3d-54272e18a682c8b82d4a86b2c07b51c303d8cead.tar.bz2 | |
gallium: add a pipe_context parameter to fence_finish
required by glClientWaitSync (GL 4.5 Core spec) that can optionally flush
the context
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/mesa/state_tracker')
| -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 82affd2..5cab5a7 100644 --- a/src/mesa/state_tracker/st_cb_flush.c +++ b/src/mesa/state_tracker/st_cb_flush.c @@ -98,7 +98,7 @@ void st_finish( struct st_context *st ) st_flush(st, &fence, 0); if(fence) { - st->pipe->screen->fence_finish(st->pipe->screen, fence, + st->pipe->screen->fence_finish(st->pipe->screen, NULL, 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 69f2a28..1fa1403 100644 --- a/src/mesa/state_tracker/st_cb_syncobj.c +++ b/src/mesa/state_tracker/st_cb_syncobj.c @@ -87,7 +87,7 @@ static void st_check_sync(struct gl_context *ctx, struct gl_sync_object *obj) return; } - if (screen->fence_finish(screen, so->fence, 0)) { + if (screen->fence_finish(screen, NULL, so->fence, 0)) { screen->fence_reference(screen, &so->fence, NULL); so->b.StatusFlag = GL_TRUE; } @@ -110,7 +110,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, timeout)) { + screen->fence_finish(screen, NULL, so->fence, timeout)) { screen->fence_reference(screen, &so->fence, NULL); so->b.StatusFlag = GL_TRUE; } |