fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-03 16:28:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "gallium/hud: automatically print % if max_value == 100"

Browse source 
This reverts commit dbfeb0ec12.

With max_value being rounded to 100, it's often wrong.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák 2016-09-30 12:55:08 +02:00
parent 1d07552ba5
commit 7b87190d2b
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/gallium/auxiliary/hud/hud_context.c
View file

@ -245,8 +245,8 @@ hud_draw_string(struct hud_context *hud, unsigned x, unsigned y,
}
static void
number_to_human_readable(uint64_t num, uint64_t max_value,
enum pipe_driver_query_type type, char *out)
number_to_human_readable(uint64_t num, enum pipe_driver_query_type type,
char *out)
{
static const char *byte_units[] =
{" B", " KB", " MB", " GB", " TB", " PB", " EB"};
@ -307,13 +307,8 @@ number_to_human_readable(uint64_t num, uint64_t max_value,
units = watt_units;
break;
default:
if (max_value == 100) {
max_unit = ARRAY_SIZE(percent_units)-1;
units = percent_units;
} else {
max_unit = ARRAY_SIZE(metric_units)-1;
units = metric_units;
}
max_unit = ARRAY_SIZE(metric_units)-1;
units = metric_units;
}
while (d > divisor && unit < max_unit) {
@ -383,7 +378,7 @@ hud_pane_accumulate_vertices(struct hud_context *hud,
pane->inner_height * (last_line - i) / last_line -
hud->font.glyph_height / 2;
number_to_human_readable(pane->max_value * i / last_line, pane->max_value,
number_to_human_readable(pane->max_value * i / last_line,
pane->type, str);
hud_draw_string(hud, x, y, "%s", str);
}
@ -394,8 +389,7 @@ hud_pane_accumulate_vertices(struct hud_context *hud,
unsigned x = pane->x1 + 2;
unsigned y = pane->y2 + 2 + i*hud->font.glyph_height;
number_to_human_readable(gr->current_value, pane->max_value,
pane->type, str);
number_to_human_readable(gr->current_value, pane->type, str);
hud_draw_string(hud, x, y, " %s: %s", gr->name, str);
i++;
}