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/include | |
| 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/include')
| -rw-r--r-- | src/gallium/include/pipe/p_screen.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h index 755291a..dd40e07 100644 --- a/src/gallium/include/pipe/p_screen.h +++ b/src/gallium/include/pipe/p_screen.h @@ -242,11 +242,20 @@ struct pipe_screen { /** * Wait for the fence to finish. + * + * If the fence was created with PIPE_FLUSH_DEFERRED, and the context is + * still unflushed, and the ctx parameter of fence_finish is equal to + * the context where the fence was created, fence_finish will flush + * the context prior to waiting for the fence. + * + * In all other cases, the ctx parameter has no effect. + * * \param timeout in nanoseconds (may be PIPE_TIMEOUT_INFINITE). */ - boolean (*fence_finish)( struct pipe_screen *screen, - struct pipe_fence_handle *fence, - uint64_t timeout ); + boolean (*fence_finish)(struct pipe_screen *screen, + struct pipe_context *ctx, + struct pipe_fence_handle *fence, + uint64_t timeout); /** * Returns a driver-specific query. |