struct metrics
{
+ /* Flag to indicate first frame is being processed. */
+ bool first_frame;
+
/* Description of all available peformance counters, counter
* groups, their names and IDs, etc. */
metrics_info_t *info;
metrics->info = info;
+ metrics->first_frame = true;
+
metrics->op = 0;
metrics->timer_begun_id = 0;
/* Discard and cleanup any outstanding queries. */
if (metrics->timer_begun_id) {
- glEndQuery (GL_TIME_ELAPSED);
glDeleteQueries (1, &metrics->timer_begun_id);
metrics->timer_begun_id = 0;
}
if (metrics->info->have_perfmon) {
if (metrics->monitor_begun_id) {
- glEndPerfMonitorAMD (metrics->monitor_begun_id);
glDeletePerfMonitorsAMD (1, &metrics->monitor_begun_id);
metrics->monitor_begun_id = 0;
}
const char *op_string;
unsigned group_index, counter;
double value;
+ int program_name_length = 0;
/* Don't print anything for stages with no alloted time. */
if (per_stage->time_ns == 0.0)
op_string = metrics_op_string (op_metrics->op);
- printf ("%21s", op_string);
-
if (op_metrics->op >= METRICS_OP_SHADER) {
- printf (" %3d", op_metrics->op - METRICS_OP_SHADER);
- } else {
- printf (" ");
+ int program = op_metrics->op - METRICS_OP_SHADER;
+ glGetObjectLabel (GL_PROGRAM, program, 0,
+ &program_name_length, NULL);
+ if (program_name_length) {
+ char *program_name;
+
+ program_name = malloc(program_name_length + 1);
+ if (program_name == 0) {
+ fprintf (stderr, "Out of memory.\n");
+ exit (1);
+ }
+ glGetObjectLabel (GL_PROGRAM, program,
+ program_name_length + 1,
+ NULL, program_name);
+ printf ("%21s ", program_name);
+ } else {
+ printf ("%21s %3d", op_string, program);
+ }
+ }
+ else {
+ printf ("%21s ", op_string);
}
if (per_stage->stage)
glGetQueryObjectui64v (metrics->swap_end_timestamp_id,
GL_QUERY_RESULT, &swap_end_timestamp);
-
- if (frames == 0) {
+
+ if (metrics->first_frame) {
/* Print header */
printf ("# frame: Frame_Number Frame_Time_milliseconds Frame_latency_milliseconds CPU_load GPU_load\n");
+
+ metrics->first_frame = false;
} else {
/* Subtract previous frame's times to get frame times. */
frame_time_ns = subtract_timestamp (swap_end_timestamp,
frames++;
- if (frames % 15 == 0) {
+ if (frames) {
double fps;
gettimeofday (&tv_now, NULL);