Mesa (master): gallium/hud: add hud_pane::hud pointer
Marek Olšák
mareko at kemper.freedesktop.org
Mon Jun 26 00:22:14 UTC 2017
Module: Mesa
Branch: master
Commit: 11cf079b678aed0c5d4d0df9fa59949ec1d07794
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=11cf079b678aed0c5d4d0df9fa59949ec1d07794
Author: Marek Olšák <marek.olsak at amd.com>
Date: Wed Jun 21 21:10:27 2017 +0200
gallium/hud: add hud_pane::hud pointer
for later use
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
---
src/gallium/auxiliary/hud/hud_context.c | 8 +++++---
src/gallium/auxiliary/hud/hud_private.h | 1 +
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/gallium/auxiliary/hud/hud_context.c b/src/gallium/auxiliary/hud/hud_context.c
index 551cea97a7..ae2e0fb1be 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 fba919e541..580ceb3af8 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;
More information about the mesa-commit
mailing list