From cea910bc28d5647ae5a9f66abe0c9ef75ab1c69b Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 8 Jul 2014 14:23:01 +0200 Subject: [PATCH] nvc0: all queries use an unsigned 64-bits integer by default Signed-off-by: Samuel Pitoiset Reviewed-by: Ilia Mirkin Reviewed-by: Martin Peres --- src/gallium/drivers/nouveau/nvc0/nvc0_query.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c index 8d9cd8b3df7..52032eb6f83 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c @@ -1418,6 +1418,13 @@ nvc0_screen_get_driver_query_info(struct pipe_screen *pscreen, if (!info) return count; + /* Init default values. */ + info->name = "this_is_not_the_query_you_are_looking_for"; + info->query_type = 0xdeadd01d; + info->max_value.u64 = 0; + info->type = PIPE_DRIVER_QUERY_TYPE_UINT64; + info->group_id = -1; + #ifdef NOUVEAU_ENABLE_DRIVER_STATISTICS if (id < NVC0_QUERY_DRV_STAT_COUNT) { info->name = nvc0_drv_stat_names[id]; @@ -1441,16 +1448,11 @@ nvc0_screen_get_driver_query_info(struct pipe_screen *pscreen, if (screen->compute) { info->name = nvc0_pm_query_names[id - NVC0_QUERY_DRV_STAT_COUNT]; info->query_type = NVC0_PM_QUERY(id - NVC0_QUERY_DRV_STAT_COUNT); - info->max_value.u64 = 0; info->group_id = NVC0_QUERY_MP_COUNTER_GROUP; return 1; } } /* user asked for info about non-existing query */ - info->name = "this_is_not_the_query_you_are_looking_for"; - info->query_type = 0xdeadd01d; - info->group_id = -1; - info->max_value.u64 = 0; return 0; } -- 2.30.2