From: Marek Olšák Date: Wed, 21 Jun 2017 19:10:27 +0000 (+0200) Subject: gallium/hud: add hud_pane::hud pointer X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=11cf079b678aed0c5d4d0df9fa59949ec1d07794;p=mesa.git gallium/hud: add hud_pane::hud pointer for later use Reviewed-by: Timothy Arceri --- diff --git a/src/gallium/auxiliary/hud/hud_context.c b/src/gallium/auxiliary/hud/hud_context.c index 551cea97a79..ae2e0fb1bee 100644 --- a/src/gallium/auxiliary/hud/hud_context.c +++ b/src/gallium/auxiliary/hud/hud_context.c @@ -778,7 +778,8 @@ hud_pane_update_dyn_ceiling(struct hud_graph *gr, struct hud_pane *pane) } static struct hud_pane * -hud_pane_create(unsigned x1, unsigned y1, unsigned x2, unsigned y2, +hud_pane_create(struct hud_context *hud, + unsigned x1, unsigned y1, unsigned x2, unsigned y2, unsigned period, uint64_t max_value, uint64_t ceiling, boolean dyn_ceiling, boolean sort_items) { @@ -787,6 +788,7 @@ hud_pane_create(unsigned x1, unsigned y1, unsigned x2, unsigned y2, if (!pane) return NULL; + pane->hud = hud; pane->x1 = x1; pane->y1 = y1; pane->x2 = x2; @@ -1123,8 +1125,8 @@ hud_parse_env_var(struct hud_context *hud, const char *env) column_width = width > column_width ? width : column_width; if (!pane) { - pane = hud_pane_create(x, y, x + width, y + height, period, 10, - ceiling, dyn_ceiling, sort_items); + pane = hud_pane_create(hud, x, y, x + width, y + height, period, 10, + ceiling, dyn_ceiling, sort_items); if (!pane) return; } diff --git a/src/gallium/auxiliary/hud/hud_private.h b/src/gallium/auxiliary/hud/hud_private.h index fba919e5410..580ceb3af8c 100644 --- a/src/gallium/auxiliary/hud/hud_private.h +++ b/src/gallium/auxiliary/hud/hud_private.h @@ -104,6 +104,7 @@ struct hud_graph { struct hud_pane { struct list_head head; + struct hud_context *hud; unsigned x1, y1, x2, y2; unsigned inner_x1; unsigned inner_y1;