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/svga | |
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/svga')
-rw-r--r-- | src/gallium/drivers/svga/svga_context.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/svga/svga_screen.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/svga/svga_context.c b/src/gallium/drivers/svga/svga_context.c index c7f4aae246d..f623caf9401 100644 --- a/src/gallium/drivers/svga/svga_context.c +++ b/src/gallium/drivers/svga/svga_context.c @@ -348,7 +348,7 @@ void svga_context_flush( struct svga_context *svga, if (SVGA_DEBUG & DEBUG_SYNC) { if (fence) - svga->pipe.screen->fence_finish( svga->pipe.screen, fence, + svga->pipe.screen->fence_finish( svga->pipe.screen, NULL, fence, PIPE_TIMEOUT_INFINITE); } @@ -369,7 +369,7 @@ svga_context_finish(struct svga_context *svga) struct pipe_fence_handle *fence = NULL; svga_context_flush(svga, &fence); - screen->fence_finish(screen, fence, PIPE_TIMEOUT_INFINITE); + screen->fence_finish(screen, NULL, fence, PIPE_TIMEOUT_INFINITE); screen->fence_reference(screen, &fence, NULL); } diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c index 13253aca43f..7c4e305f504 100644 --- a/src/gallium/drivers/svga/svga_screen.c +++ b/src/gallium/drivers/svga/svga_screen.c @@ -804,6 +804,7 @@ svga_fence_reference(struct pipe_screen *screen, static boolean svga_fence_finish(struct pipe_screen *screen, + struct pipe_context *ctx, struct pipe_fence_handle *fence, uint64_t timeout) { |