diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2015-08-06 23:41:38 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2015-08-07 00:06:13 +0200 |
| commit | 592ce6e2d1b2c804a95cb00c06e7bbb9d83f554b (patch) | |
| tree | 3cbaa5e483469ed31a8ed69d50498b3567f87689 /src/gallium/drivers/r300/r300_query.c | |
| parent | 8118d3719aee5fdf313c33dbf3256dd78ff46bea (diff) | |
| download | external_mesa3d-592ce6e2d1b2c804a95cb00c06e7bbb9d83f554b.zip external_mesa3d-592ce6e2d1b2c804a95cb00c06e7bbb9d83f554b.tar.gz external_mesa3d-592ce6e2d1b2c804a95cb00c06e7bbb9d83f554b.tar.bz2 | |
gallium/radeon: unify buffer_wait and buffer_is_busy in the winsys interface
The timeout parameter covers both cases.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src/gallium/drivers/r300/r300_query.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_query.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_query.c b/src/gallium/drivers/r300/r300_query.c index 6a4cd71..4dd8156 100644 --- a/src/gallium/drivers/r300/r300_query.c +++ b/src/gallium/drivers/r300/r300_query.c @@ -146,10 +146,11 @@ static boolean r300_get_query_result(struct pipe_context* pipe, if (q->type == PIPE_QUERY_GPU_FINISHED) { if (wait) { - r300->rws->buffer_wait(q->buf, RADEON_USAGE_READWRITE); + r300->rws->buffer_wait(q->buf, PIPE_TIMEOUT_INFINITE, + RADEON_USAGE_READWRITE); vresult->b = TRUE; } else { - vresult->b = !r300->rws->buffer_is_busy(q->buf, RADEON_USAGE_READWRITE); + vresult->b = r300->rws->buffer_wait(q->buf, 0, RADEON_USAGE_READWRITE); } return vresult->b; } |