diff options
author | Marek Olšák <[email protected]> | 2011-03-05 21:23:54 +0100 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2011-03-08 23:52:37 +0100 |
commit | b39bccbd4ed71e9585da4cf5acf7b887b2e90899 (patch) | |
tree | 8aafddda49b4d4e4cdf19ec76350583b7c4d41b4 /src/gallium/include/pipe | |
parent | 5257a6dbc65d742e6d0fcf4278a4157b2f39fdf7 (diff) |
gallium: add timeout parameter to fence_finish
This is a follow-up to the ARB_sync patch for st/mesa and completes
the ARB_sync implementation.
Diffstat (limited to 'src/gallium/include/pipe')
-rw-r--r-- | src/gallium/include/pipe/p_defines.h | 2 | ||||
-rw-r--r-- | src/gallium/include/pipe/p_screen.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index edbaaae334a..9350a755d73 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -426,6 +426,8 @@ enum pipe_transfer_usage { #define PIPE_SWIZZLE_ONE 5 +#define PIPE_TIMEOUT_INFINITE 0xffffffffffffffffull + /** * Implementation capabilities/limits which are queried through * pipe_screen::get_param() and pipe_screen::get_paramf(). diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h index 850eb84a3c8..8e77e77db39 100644 --- a/src/gallium/include/pipe/p_screen.h +++ b/src/gallium/include/pipe/p_screen.h @@ -193,11 +193,13 @@ struct pipe_screen { /** * Wait for the fence to finish. * \param flags driver-specific meaning + * \param timeout in nanoseconds * \return zero on success. */ int (*fence_finish)( struct pipe_screen *screen, struct pipe_fence_handle *fence, - unsigned flags ); + unsigned flags, + uint64_t timeout ); }; |