r600g,radeonsi: add a bunch of useful queries for the HUD
diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c
index e9218a2..38889fd 100644
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -79,6 +79,10 @@
case R600_QUERY_REQUESTED_VRAM:
case R600_QUERY_REQUESTED_GTT:
case R600_QUERY_BUFFER_WAIT_TIME:
+ case R600_QUERY_NUM_CS_FLUSHES:
+ case R600_QUERY_NUM_BYTES_MOVED:
+ case R600_QUERY_VRAM_USAGE:
+ case R600_QUERY_GTT_USAGE:
return NULL;
}
@@ -379,6 +383,10 @@
case R600_QUERY_REQUESTED_VRAM:
case R600_QUERY_REQUESTED_GTT:
case R600_QUERY_BUFFER_WAIT_TIME:
+ case R600_QUERY_NUM_CS_FLUSHES:
+ case R600_QUERY_NUM_BYTES_MOVED:
+ case R600_QUERY_VRAM_USAGE:
+ case R600_QUERY_GTT_USAGE:
skip_allocation = true;
break;
default:
@@ -432,11 +440,19 @@
return;
case R600_QUERY_REQUESTED_VRAM:
case R600_QUERY_REQUESTED_GTT:
+ case R600_QUERY_VRAM_USAGE:
+ case R600_QUERY_GTT_USAGE:
rquery->begin_result = 0;
return;
case R600_QUERY_BUFFER_WAIT_TIME:
rquery->begin_result = rctx->ws->query_value(rctx->ws, RADEON_BUFFER_WAIT_TIME_NS);
return;
+ case R600_QUERY_NUM_CS_FLUSHES:
+ rquery->begin_result = rctx->ws->query_value(rctx->ws, RADEON_NUM_CS_FLUSHES);
+ return;
+ case R600_QUERY_NUM_BYTES_MOVED:
+ rquery->begin_result = rctx->ws->query_value(rctx->ws, RADEON_NUM_BYTES_MOVED);
+ return;
}
/* Discard the old query buffers. */
@@ -483,6 +499,18 @@
case R600_QUERY_BUFFER_WAIT_TIME:
rquery->end_result = rctx->ws->query_value(rctx->ws, RADEON_BUFFER_WAIT_TIME_NS);
return;
+ case R600_QUERY_NUM_CS_FLUSHES:
+ rquery->end_result = rctx->ws->query_value(rctx->ws, RADEON_NUM_CS_FLUSHES);
+ return;
+ case R600_QUERY_NUM_BYTES_MOVED:
+ rquery->end_result = rctx->ws->query_value(rctx->ws, RADEON_NUM_BYTES_MOVED);
+ return;
+ case R600_QUERY_VRAM_USAGE:
+ rquery->end_result = rctx->ws->query_value(rctx->ws, RADEON_VRAM_USAGE);
+ return;
+ case R600_QUERY_GTT_USAGE:
+ rquery->end_result = rctx->ws->query_value(rctx->ws, RADEON_GTT_USAGE);
+ return;
}
r600_emit_query_end(rctx, rquery);
@@ -525,6 +553,10 @@
case R600_QUERY_REQUESTED_VRAM:
case R600_QUERY_REQUESTED_GTT:
case R600_QUERY_BUFFER_WAIT_TIME:
+ case R600_QUERY_NUM_CS_FLUSHES:
+ case R600_QUERY_NUM_BYTES_MOVED:
+ case R600_QUERY_VRAM_USAGE:
+ case R600_QUERY_GTT_USAGE:
result->u64 = query->end_result - query->begin_result;
return TRUE;
}