diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:45:43 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:45:43 +0000 |
| commit | 2ba37c52131b39d6d0ec2452a95ea7a9d7ea6b8f (patch) | |
| tree | 2da543a02115219d34deffe911226f3f85f443ac /lib/mesa/src/gallium/auxiliary/hud | |
| parent | e7a2786346bc6e40b27248cf122036d8c701fa22 (diff) | |
import Mesa 11.0.6
Diffstat (limited to 'lib/mesa/src/gallium/auxiliary/hud')
| -rw-r--r-- | lib/mesa/src/gallium/auxiliary/hud/hud_context.h | 5 | ||||
| -rw-r--r-- | lib/mesa/src/gallium/auxiliary/hud/hud_fps.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/lib/mesa/src/gallium/auxiliary/hud/hud_context.h b/lib/mesa/src/gallium/auxiliary/hud/hud_context.h index 5a7e13b27..abf2ad586 100644 --- a/lib/mesa/src/gallium/auxiliary/hud/hud_context.h +++ b/lib/mesa/src/gallium/auxiliary/hud/hud_context.h @@ -32,7 +32,6 @@ struct hud_context; struct cso_context; struct pipe_context; struct pipe_resource; -struct util_queue_monitoring; struct hud_context * hud_create(struct pipe_context *pipe, struct cso_context *cso); @@ -43,8 +42,4 @@ hud_destroy(struct hud_context *hud); void hud_draw(struct hud_context *hud, struct pipe_resource *tex); -void -hud_add_queue_for_monitoring(struct hud_context *hud, - struct util_queue_monitoring *queue_info); - #endif diff --git a/lib/mesa/src/gallium/auxiliary/hud/hud_fps.c b/lib/mesa/src/gallium/auxiliary/hud/hud_fps.c index 8aa7a665a..a360bc2ed 100644 --- a/lib/mesa/src/gallium/auxiliary/hud/hud_fps.c +++ b/lib/mesa/src/gallium/auxiliary/hud/hud_fps.c @@ -47,12 +47,12 @@ query_fps(struct hud_graph *gr) if (info->last_time) { if (info->last_time + gr->pane->period <= now) { - double fps = ((uint64_t)info->frames) * 1000000 / + double fps = (uint64_t)info->frames * 1000000 / (double)(now - info->last_time); info->frames = 0; info->last_time = now; - hud_graph_add_value(gr, fps); + hud_graph_add_value(gr, (uint64_t) fps); } } else { |