Patches 11-15 are all
Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu>
but please fix up patch #13 with that small bit I mentioned.
On Sun, Mar 22, 2015 at 11:35 AM, Samuel Pitoiset
<samuel.pitoi...@gmail.com> wrote:
> Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
> ---
> 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 c3a1899..fcdb0a3 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->group_id = 0;
> + info->max_value.u64 = 0;
> + info->type = PIPE_DRIVER_QUERY_TYPE_UINT64;
> +
> #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 = 0;
> - info->max_value.u64 = 0;
> return 0;
> }
>
> --
> 2.3.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
