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/gallium/state_trackers/vdpau | |
| 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/gallium/state_trackers/vdpau')
| -rw-r--r-- | src/gallium/state_trackers/vdpau/presentation.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/vdpau/presentation.c b/src/gallium/state_trackers/vdpau/presentation.c index e7f387e..2862eaf 100644 --- a/src/gallium/state_trackers/vdpau/presentation.c +++ b/src/gallium/state_trackers/vdpau/presentation.c @@ -327,7 +327,7 @@ vlVdpPresentationQueueBlockUntilSurfaceIdle(VdpPresentationQueue presentation_qu pipe_mutex_lock(pq->device->mutex); if (surf->fence) { screen = pq->device->vscreen->pscreen; - screen->fence_finish(screen, surf->fence, PIPE_TIMEOUT_INFINITE); + screen->fence_finish(screen, NULL, surf->fence, PIPE_TIMEOUT_INFINITE); screen->fence_reference(screen, &surf->fence, NULL); } pipe_mutex_unlock(pq->device->mutex); @@ -369,7 +369,7 @@ vlVdpPresentationQueueQuerySurfaceStatus(VdpPresentationQueue presentation_queue } else { pipe_mutex_lock(pq->device->mutex); screen = pq->device->vscreen->pscreen; - if (screen->fence_finish(screen, surf->fence, 0)) { + if (screen->fence_finish(screen, NULL, surf->fence, 0)) { screen->fence_reference(screen, &surf->fence, NULL); *status = VDP_PRESENTATION_QUEUE_STATUS_VISIBLE; pipe_mutex_unlock(pq->device->mutex); |