radeon: use PIPE_DRIVER_QUERY_FLAG_DONT_LIST for perfcounters

[mesa.git] / src / gallium / drivers / radeon / r600_query.c

diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c
index 38bbbbf8a5ef1077052ceae92e21d83b954f44d0..09eabab0e7d3c6766eff357ed70b98d7f59b6489 100644 (file)
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -1141,11 +1141,15 @@ static int r600_get_driver_query_info(struct pipe_screen *screen,
        struct r600_common_screen *rscreen = (struct r600_common_screen*)screen;
        unsigned num_queries = r600_get_num_queries(rscreen);
 
-       if (!info)
-               return num_queries;
+       if (!info) {
+               unsigned num_perfcounters =
+                       r600_get_perfcounter_info(rscreen, 0, NULL);
+
+               return num_queries + num_perfcounters;
+       }
 
        if (index >= num_queries)
-               return 0;
+               return r600_get_perfcounter_info(rscreen, index - num_queries, info);
 
        *info = r600_driver_query_list[index];
 
@@ -1166,9 +1170,19 @@ static int r600_get_driver_query_info(struct pipe_screen *screen,
        return 1;
 }
 
+static int r600_get_driver_query_group_info(struct pipe_screen *screen,
+                                           unsigned index,
+                                           struct pipe_driver_query_group_info *info)
+{
+       struct r600_common_screen *rscreen = (struct r600_common_screen *)screen;
+
+       return r600_get_perfcounter_group_info(rscreen, index, info);
+}
+
 void r600_query_init(struct r600_common_context *rctx)
 {
        rctx->b.create_query = r600_create_query;
+       rctx->b.create_batch_query = r600_create_batch_query;
        rctx->b.destroy_query = r600_destroy_query;
        rctx->b.begin_query = r600_begin_query;
        rctx->b.end_query = r600_end_query;
@@ -1185,4 +1199,5 @@ void r600_query_init(struct r600_common_context *rctx)
 void r600_init_screen_query_functions(struct r600_common_screen *rscreen)
 {
        rscreen->b.get_driver_query_info = r600_get_driver_query_info;
+       rscreen->b.get_driver_query_group_info = r600_get_driver_query_group_info;
 }