diff options
| author | Samuel Pitoiset <[email protected]> | 2014-07-07 23:49:14 +0200 |
|---|---|---|
| committer | Martin Peres <[email protected]> | 2015-05-06 00:03:35 +0300 |
| commit | 546ec980f850fee067fd1dddad19a8dfd6b7e672 (patch) | |
| tree | e1dc8e58f75d3f0ba8b39c68a5e03e36c855421c /src/gallium/drivers/radeon | |
| parent | d5b2832c1151337d37217a30bcb55d7f90dd1b47 (diff) | |
gallium: replace pipe_driver_query_info::max_value by a union
This allows queries to return different numeric types.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Martin Peres <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeon')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index a9b04d8ccf9..42e681dc7d2 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -657,18 +657,18 @@ static int r600_get_driver_query_info(struct pipe_screen *screen, { struct r600_common_screen *rscreen = (struct r600_common_screen*)screen; struct pipe_driver_query_info list[] = { - {"draw-calls", R600_QUERY_DRAW_CALLS, 0}, - {"requested-VRAM", R600_QUERY_REQUESTED_VRAM, rscreen->info.vram_size, PIPE_DRIVER_QUERY_TYPE_BYTES}, - {"requested-GTT", R600_QUERY_REQUESTED_GTT, rscreen->info.gart_size, PIPE_DRIVER_QUERY_TYPE_BYTES}, - {"buffer-wait-time", R600_QUERY_BUFFER_WAIT_TIME, 0}, - {"num-cs-flushes", R600_QUERY_NUM_CS_FLUSHES, 0}, - {"num-bytes-moved", R600_QUERY_NUM_BYTES_MOVED, 0, PIPE_DRIVER_QUERY_TYPE_BYTES}, - {"VRAM-usage", R600_QUERY_VRAM_USAGE, rscreen->info.vram_size, PIPE_DRIVER_QUERY_TYPE_BYTES}, - {"GTT-usage", R600_QUERY_GTT_USAGE, rscreen->info.gart_size, PIPE_DRIVER_QUERY_TYPE_BYTES}, - {"temperature", R600_QUERY_GPU_TEMPERATURE, 100}, - {"shader-clock", R600_QUERY_CURRENT_GPU_SCLK, 0}, - {"memory-clock", R600_QUERY_CURRENT_GPU_MCLK, 0}, - {"GPU-load", R600_QUERY_GPU_LOAD, 100} + {"draw-calls", R600_QUERY_DRAW_CALLS, {0}}, + {"requested-VRAM", R600_QUERY_REQUESTED_VRAM, {rscreen->info.vram_size}, PIPE_DRIVER_QUERY_TYPE_BYTES}, + {"requested-GTT", R600_QUERY_REQUESTED_GTT, {rscreen->info.gart_size}, PIPE_DRIVER_QUERY_TYPE_BYTES}, + {"buffer-wait-time", R600_QUERY_BUFFER_WAIT_TIME, {0}}, + {"num-cs-flushes", R600_QUERY_NUM_CS_FLUSHES, {0}}, + {"num-bytes-moved", R600_QUERY_NUM_BYTES_MOVED, {0}, PIPE_DRIVER_QUERY_TYPE_BYTES}, + {"VRAM-usage", R600_QUERY_VRAM_USAGE, {rscreen->info.vram_size}, PIPE_DRIVER_QUERY_TYPE_BYTES}, + {"GTT-usage", R600_QUERY_GTT_USAGE, {rscreen->info.gart_size}, PIPE_DRIVER_QUERY_TYPE_BYTES}, + {"temperature", R600_QUERY_GPU_TEMPERATURE, {100}}, + {"shader-clock", R600_QUERY_CURRENT_GPU_SCLK, {0}}, + {"memory-clock", R600_QUERY_CURRENT_GPU_MCLK, {0}}, + {"GPU-load", R600_QUERY_GPU_LOAD, {100}} }; unsigned num_queries; |