fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 17:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

hud: extract float printf modifer selection logic to helper

Browse source 
And use it when printing to a file from hud_graph_add_value.

This turns:
  fps: 59.972473
Into:
  fps: 59.97

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20494>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2023-01-04 10:08:38 +01:00
parent 31d95dd3c6
commit 595079c37c
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -219,6 +219,24 @@ hud_draw_string(struct hud_context *hud, unsigned x, unsigned y,
hud->text.num_vertices += num/4; hud->text.num_vertices += num/4;
} }
static const char *
get_float_modifier(double 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)
return "%.0f";
else if (d >= 100 || d*10 == (int)(d*10))
return "%.1f";
else if (d >= 10 || d*100 == (int)(d*100))
return "%.2f";
else
return "%.3f";
}
static void static void
number_to_human_readable(double num, enum pipe_driver_query_type type, number_to_human_readable(double num, enum pipe_driver_query_type type,
char *out) char *out)
@ -296,19 +314,8 @@ number_to_human_readable(double num, enum pipe_driver_query_type type,
unit++; unit++;
} }
/* Round to 3 decimal places so as not to print trailing zeros. */ sprintf(out, get_float_modifier(d), d);
if (d*1000 != (int)(d*1000)) sprintf(out, "%s", units[unit]);
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 >= 100 || d*10 == (int)(d*10))
sprintf(out, "%.1f%s", d, units[unit]);
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 static void
@ -988,7 +995,8 @@ hud_graph_add_value(struct hud_graph *gr, double value)
fprintf(gr->fd, "%s: ", gr->name); fprintf(gr->fd, "%s: ", gr->name);
} }
if (fabs(value - lround(value)) > FLT_EPSILON) { if (fabs(value - lround(value)) > FLT_EPSILON) {
fprintf(gr->fd, "%f\n", value); fprintf(gr->fd, get_float_modifier(value), value);
fprintf(gr->fd, "\n");
} }
else { else {
fprintf(gr->fd, "%" PRIu64 "\n", (uint64_t) lround(value)); fprintf(gr->fd, "%" PRIu64 "\n", (uint64_t) lround(value));