diff options
| author | Marek Olšák <[email protected]> | 2016-08-06 16:41:42 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-08-10 01:11:10 +0200 |
| commit | 54272e18a682c8b82d4a86b2c07b51c303d8cead (patch) | |
| tree | c9c0ac7ad2fb4144ebeb9c7851eaa19a8103973c /src/gallium/drivers/llvmpipe | |
| parent | c6043e7d54fc48771856a50235f9141b711151f3 (diff) | |
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 <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/llvmpipe')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_flush.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_screen.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_flush.c b/src/gallium/drivers/llvmpipe/lp_flush.c index 241c2ccafb7..452753f8810 100644 --- a/src/gallium/drivers/llvmpipe/lp_flush.c +++ b/src/gallium/drivers/llvmpipe/lp_flush.c @@ -82,7 +82,8 @@ llvmpipe_finish( struct pipe_context *pipe, struct pipe_fence_handle *fence = NULL; llvmpipe_flush(pipe, &fence, reason); if (fence) { - pipe->screen->fence_finish(pipe->screen, fence, PIPE_TIMEOUT_INFINITE); + pipe->screen->fence_finish(pipe->screen, NULL, fence, + PIPE_TIMEOUT_INFINITE); pipe->screen->fence_reference(pipe->screen, &fence, NULL); } } diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index 61c3fb7a410..1c00aa91034 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -572,6 +572,7 @@ llvmpipe_fence_reference(struct pipe_screen *screen, */ static boolean llvmpipe_fence_finish(struct pipe_screen *screen, + struct pipe_context *ctx, struct pipe_fence_handle *fence_handle, uint64_t timeout) { |