diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-02-05 13:48:35 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-02-05 13:48:35 +0000 |
| commit | a1af8eec66c5f7ec421e8011b41c1a7c36319f9f (patch) | |
| tree | bc76a431699807cf60cf8ba82ff6b3b1ff34f309 /src/gallium/auxiliary/util/u_time.h | |
| parent | c036d13d7d2cc905226fe53ebd86a18da808963f (diff) | |
| parent | bee9964b29b2428ee75e2d1efc0e1d2c2518a417 (diff) | |
Merge remote branch 'origin/lp-binning'
Conflicts:
src/gallium/auxiliary/util/u_dl.c
src/gallium/auxiliary/util/u_time.h
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_surface.c
src/gallium/drivers/llvmpipe/lp_tex_cache.c
src/gallium/drivers/llvmpipe/lp_tile_cache.c
Diffstat (limited to 'src/gallium/auxiliary/util/u_time.h')
| -rw-r--r-- | src/gallium/auxiliary/util/u_time.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/util/u_time.h b/src/gallium/auxiliary/util/u_time.h index 7580ac0de4..15899c2c88 100644 --- a/src/gallium/auxiliary/util/u_time.h +++ b/src/gallium/auxiliary/util/u_time.h @@ -67,6 +67,9 @@ util_time_get(struct util_time *t) } +/** + * Return t2 = t1 + usecs + */ PIPE_DEPRECATED static INLINE void util_time_add(const struct util_time *t1, @@ -77,6 +80,9 @@ util_time_add(const struct util_time *t1, } +/** + * Return difference between times, in microseconds + */ PIPE_DEPRECATED static INLINE int64_t util_time_diff(const struct util_time *t1, @@ -105,6 +111,9 @@ _util_time_compare(const struct util_time *t1, } +/** + * Returns non-zero when the timeout expires. + */ PIPE_DEPRECATED static INLINE boolean util_time_timeout(const struct util_time *start, @@ -115,6 +124,9 @@ util_time_timeout(const struct util_time *start, } +/** + * Return current time in microseconds + */ PIPE_DEPRECATED static INLINE int64_t util_time_micros(void) |