Merge remote-tracking branch 'public/master' into vulkan

[mesa.git] / src / gallium / drivers / nouveau / nv50 / nv50_query_hw_metric.c

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.c b/src/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.c
index 13dad30f113ff7a5469a397032cdade1d9226bb3..4a605f21c45787783dbb6974108adab776d821c9 100644 (file)
--- a/src/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.c
@@ -71,7 +71,8 @@ nv50_hw_metric_destroy_query(struct nv50_context *nv50,
    unsigned i;
 
    for (i = 0; i < hmq->num_queries; i++)
-      hmq->queries[i]->funcs->destroy_query(nv50, hmq->queries[i]);
+      if (hmq->queries[i]->funcs->destroy_query)
+         hmq->queries[i]->funcs->destroy_query(nv50, hmq->queries[i]);
    FREE(hmq);
 }
 
@@ -198,7 +199,7 @@ nv50_hw_metric_get_driver_query_info(struct nv50_screen *screen, unsigned id,
          if (screen->base.class_3d >= NV84_3D_CLASS) {
             info->name = nv50_hw_metric_names[id];
             info->query_type = NV50_HW_METRIC_QUERY(id);
-            info->group_id = -1;
+            info->group_id = NV50_HW_METRIC_QUERY_GROUP;
             return 1;
          }
       }