AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium/hud: draw numbers with 3 decimal places if those aren't 0

Browse Source 
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák
2016-08-18 17:21:54 +02:00
parent b9c9551c09
commit a33eb48d61
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/auxiliary/hud/hud_context.c
+12 -5
View File
@@ -296,12 +296,19 @@ number_to_human_readable(uint64_t num, uint64_t max_value,
unit++;
}
if (d >= 100 || d == (int)d)
/* Round to 3 decimal places so as not to print trailing zeros. */
if (d*1000 != (int)(d*1000))
d = round(d * 1000) / 1000;
/* Show at least 4 digits with at most 3 decimal places, but not zeros. */
if (d >= 1000 || d == (int)d)
sprintf(out, "%.0f%s", d, units[unit]);
else if (d >= 10 || d*10 == (int)(d*10))
else if (d >= 100 || d*10 == (int)(d*10))
sprintf(out, "%.1f%s", d, units[unit]);
else
else if (d >= 10 || d*100 == (int)(d*100))
sprintf(out, "%.2f%s", d, units[unit]);
else
sprintf(out, "%.3f%s", d, units[unit]);
}
static void
@@ -536,7 +543,7 @@ hud_draw(struct hud_context *hud, struct pipe_resource *tex)
/* prepare vertex buffers */
hud_alloc_vertices(hud, &hud->bg, 4 * 128, 2 * sizeof(float));
hud_alloc_vertices(hud, &hud->whitelines, 4 * 256, 2 * sizeof(float));
hud_alloc_vertices(hud, &hud->text, 4 * 512, 4 * sizeof(float));
hud_alloc_vertices(hud, &hud->text, 4 * 1024, 4 * sizeof(float));
/* prepare all graphs */
hud_batch_query_update(hud->batch_query);
@@ -1026,7 +1033,7 @@ hud_parse_env_var(struct hud_context *hud, const char *env)
case ';':
env++;
y = 10;
x += column_width + hud->font.glyph_width * 7;
x += column_width + hud->font.glyph_width * 9;
height = 100;
if (pane && pane->num_graphs) {