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/drivers/softpipe | |
| 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/drivers/softpipe')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_fence.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_flush.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/softpipe/sp_fence.c b/src/gallium/drivers/softpipe/sp_fence.c index 6168236..1861b0d 100644 --- a/src/gallium/drivers/softpipe/sp_fence.c +++ b/src/gallium/drivers/softpipe/sp_fence.c @@ -42,6 +42,7 @@ softpipe_fence_reference(struct pipe_screen *screen, static boolean softpipe_fence_finish(struct pipe_screen *screen, + struct pipe_context *ctx, struct pipe_fence_handle *fence, uint64_t timeout) { diff --git a/src/gallium/drivers/softpipe/sp_flush.c b/src/gallium/drivers/softpipe/sp_flush.c index 29fcf7f..656d8a3 100644 --- a/src/gallium/drivers/softpipe/sp_flush.c +++ b/src/gallium/drivers/softpipe/sp_flush.c @@ -153,7 +153,7 @@ 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, + pipe->screen->fence_finish(pipe->screen, NULL, fence, PIPE_TIMEOUT_INFINITE); pipe->screen->fence_reference(pipe->screen, &fence, NULL); } |