diff options
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_query.c | 16 |
3 files changed, 21 insertions, 0 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 0e113a1b827..443a91eb89f 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -1081,8 +1081,11 @@ static int r600_get_driver_query_info(struct pipe_screen *screen, unsigned index, struct pipe_driver_query_info *info) { + struct r600_screen *rscreen = (struct r600_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, TRUE}, + {"requested-GTT", R600_QUERY_REQUESTED_GTT, rscreen->info.gart_size, TRUE}, }; if (!info) diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index 9c3a4c2b229..541d42e7983 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -76,6 +76,8 @@ #define R600_CONTEXT_FLUSH_AND_INV_DB_META (1 << 7) #define R600_QUERY_DRAW_CALLS (PIPE_QUERY_DRIVER_SPECIFIC + 0) +#define R600_QUERY_REQUESTED_VRAM (PIPE_QUERY_DRIVER_SPECIFIC + 1) +#define R600_QUERY_REQUESTED_GTT (PIPE_QUERY_DRIVER_SPECIFIC + 2) struct r600_context; struct r600_bytecode; diff --git a/src/gallium/drivers/r600/r600_query.c b/src/gallium/drivers/r600/r600_query.c index 6ee4bbd3a00..e2072ca27a4 100644 --- a/src/gallium/drivers/r600/r600_query.c +++ b/src/gallium/drivers/r600/r600_query.c @@ -45,6 +45,8 @@ static struct r600_resource *r600_new_query_buffer(struct r600_context *ctx, uns /* Non-GPU queries. */ switch (type) { case R600_QUERY_DRAW_CALLS: + case R600_QUERY_REQUESTED_VRAM: + case R600_QUERY_REQUESTED_GTT: return NULL; } @@ -310,6 +312,8 @@ static struct pipe_query *r600_create_query(struct pipe_context *ctx, unsigned q break; /* Non-GPU queries. */ case R600_QUERY_DRAW_CALLS: + case R600_QUERY_REQUESTED_VRAM: + case R600_QUERY_REQUESTED_GTT: skip_allocation = true; break; default: @@ -361,6 +365,10 @@ static void r600_begin_query(struct pipe_context *ctx, struct pipe_query *query) case R600_QUERY_DRAW_CALLS: rquery->begin_result = rctx->num_draw_calls; return; + case R600_QUERY_REQUESTED_VRAM: + case R600_QUERY_REQUESTED_GTT: + rquery->begin_result = 0; + return; } /* Discard the old query buffers. */ @@ -398,6 +406,12 @@ static void r600_end_query(struct pipe_context *ctx, struct pipe_query *query) case R600_QUERY_DRAW_CALLS: rquery->end_result = rctx->num_draw_calls; return; + case R600_QUERY_REQUESTED_VRAM: + rquery->end_result = rctx->ws->query_value(rctx->ws, RADEON_REQUESTED_VRAM_MEMORY); + return; + case R600_QUERY_REQUESTED_GTT: + rquery->end_result = rctx->ws->query_value(rctx->ws, RADEON_REQUESTED_GTT_MEMORY); + return; } r600_emit_query_end(rctx, rquery); @@ -437,6 +451,8 @@ static boolean r600_get_query_buffer_result(struct r600_context *ctx, /* Non-GPU queries. */ switch (query->type) { case R600_QUERY_DRAW_CALLS: + case R600_QUERY_REQUESTED_VRAM: + case R600_QUERY_REQUESTED_GTT: result->u64 = query->end_result - query->begin_result; return TRUE; } |