Add a pointer to metrics_info_t from metrics_t

[fips] / metrics.c

diff --git a/metrics.c b/metrics.c
index fdd794a726863bba4a4b756d81be9d95e82b10d1..47df1e0cf4a7071f5186b24c04cf95898da92311 100644 (file)
--- a/metrics.c
+++ b/metrics.c
@@ -69,6 +69,11 @@ typedef struct op_metrics
 
 struct metrics
 {
+       /* Description of all available peformance counters, counter
+        * groups, their names and IDs, etc. */
+       metrics_info_t *info;
+
+       /* The current operation being measured. */
        metrics_op_t op;
 
        /* GL_TIME_ELAPSED query for which glEndQuery has not yet
@@ -95,6 +100,87 @@ struct metrics
        op_metrics_t *op_metrics;
 };
 
+metrics_t *
+metrics_create (metrics_info_t *info)
+{
+       metrics_t *metrics;
+
+       metrics = xmalloc (sizeof (metrics_t));
+
+       metrics->info = info;
+
+       metrics->op = 0;
+
+       metrics->timer_begun_id = 0;
+
+       metrics->timer_head = NULL;
+       metrics->timer_tail = NULL;
+
+       metrics->monitor_begun_id = 0;
+
+       metrics->monitor_head = NULL;
+       metrics->monitor_tail = NULL;
+
+       metrics->monitors_in_flight = 0;
+
+       metrics->num_op_metrics = 0;
+       metrics->op_metrics = NULL;
+
+       return metrics;
+}
+
+void
+metrics_fini (metrics_t *metrics)
+{
+       timer_query_t *timer, *timer_next;
+       monitor_t *monitor, *monitor_next;
+
+       /* 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;
+       }
+
+       for (timer = metrics->timer_head;
+            timer;
+            timer = timer_next)
+       {
+               glDeleteQueries (1, &timer->id);
+               timer_next = timer->next;
+               free (timer);
+       }
+       metrics->timer_head = NULL;
+       metrics->timer_tail = NULL;
+
+       if (metrics->monitor_begun_id) {
+               glEndPerfMonitorAMD (metrics->monitor_begun_id);
+               glDeletePerfMonitorsAMD (1, &metrics->monitor_begun_id);
+               metrics->monitor_begun_id = 0;
+       }
+
+       for (monitor = metrics->monitor_head;
+            monitor;
+            monitor = monitor_next)
+       {
+               glDeletePerfMonitorsAMD (1, &monitor->id);
+               monitor_next = monitor->next;
+               free (monitor);
+       }
+       metrics->monitor_head = NULL;
+       metrics->monitor_tail = NULL;
+
+       metrics->monitors_in_flight = 0;
+}
+
+void
+metrics_destroy (metrics_t *metrics)
+{
+       metrics_fini (metrics);
+
+       free (metrics);
+}
+
 static const char *
 metrics_op_string (metrics_op_t op)
 {
@@ -152,12 +238,12 @@ metrics_counter_start (void)
 
        glGenPerfMonitorsAMD (1, &metrics->monitor_begun_id);
 
-       for (i = 0; i < ctx->metrics_info.num_groups; i++)
+       for (i = 0; i < metrics->info->num_groups; i++)
        {
                metrics_group_info_t *group;
                int num_counters;
 
-               group = &ctx->metrics_info.groups[i];
+               group = &metrics->info->groups[i];
 
                num_counters = group->num_counters;
                if (group->max_active_counters < group->num_counters)
@@ -256,7 +342,7 @@ metrics_get_current_op (void)
 static void
 op_metrics_init (context_t *ctx, op_metrics_t *metrics, metrics_op_t op)
 {
-       metrics_info_t *info = &ctx->metrics_info;
+       metrics_info_t *info = ctx->metrics->info;
        unsigned i, j;
 
        metrics->op = op;
@@ -305,7 +391,7 @@ accumulate_program_metrics (metrics_op_t op, GLuint *result, GLuint size)
        p += sizeof(var);
 
        context_t *ctx = context_get_current ();
-       metrics_info_t *info = &ctx->metrics_info;
+       metrics_info_t *info = ctx->metrics->info;
        op_metrics_t *metrics = ctx_get_op_metrics (ctx, op);
        unsigned char *p = (unsigned char *) result;
 
@@ -415,7 +501,7 @@ print_per_stage_metrics (context_t *ctx,
                         per_stage_metrics_t *per_stage,
                         double total)
 {
-       metrics_info_t *info = &ctx->metrics_info;
+       metrics_info_t *info = ctx->metrics->info;
        op_metrics_t *metric = per_stage->metrics;
        metrics_group_info_t *group;
        const char *op_string;
@@ -497,7 +583,7 @@ print_program_metrics (void)
 {
        context_t *ctx = context_get_current ();
        metrics_t *metrics = ctx->metrics;
-       metrics_info_t *info = &ctx->metrics_info;
+       metrics_info_t *info = metrics->info;
        unsigned num_shader_stages = info->num_shader_stages;
        per_stage_metrics_t *sorted, *per_stage;
        double total_time, op_cycles;
@@ -600,7 +686,7 @@ metrics_exit (void)
 {
        context_t *ctx = context_get_current ();
        metrics_t *metrics = ctx->metrics;
-       metrics_info_t *info = &ctx->metrics_info;
+       metrics_info_t *info = metrics->info;
        unsigned i, j;
        timer_query_t *timer, *timer_next;
        monitor_t *monitor, *monitor_next;
@@ -756,82 +842,3 @@ metrics_end_frame (void)
                print_program_metrics ();
        }
 }
-
-metrics_t *
-metrics_create (void)
-{
-       metrics_t *metrics;
-
-       metrics = xmalloc (sizeof (metrics_t));
-
-       metrics->op = 0;
-
-       metrics->timer_begun_id = 0;
-
-       metrics->timer_head = NULL;
-       metrics->timer_tail = NULL;
-
-       metrics->monitor_begun_id = 0;
-
-       metrics->monitor_head = NULL;
-       metrics->monitor_tail = NULL;
-
-       metrics->monitors_in_flight = 0;
-
-       metrics->num_op_metrics = 0;
-       metrics->op_metrics = NULL;
-
-       return metrics;
-}
-
-void
-metrics_fini (metrics_t *metrics)
-{
-       timer_query_t *timer, *timer_next;
-       monitor_t *monitor, *monitor_next;
-
-       /* 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;
-       }
-
-       for (timer = metrics->timer_head;
-            timer;
-            timer = timer_next)
-       {
-               glDeleteQueries (1, &timer->id);
-               timer_next = timer->next;
-               free (timer);
-       }
-       metrics->timer_head = NULL;
-       metrics->timer_tail = NULL;
-
-       if (metrics->monitor_begun_id) {
-               glEndPerfMonitorAMD (metrics->monitor_begun_id);
-               glDeletePerfMonitorsAMD (1, &metrics->monitor_begun_id);
-               metrics->monitor_begun_id = 0;
-       }
-
-       for (monitor = metrics->monitor_head;
-            monitor;
-            monitor = monitor_next)
-       {
-               glDeletePerfMonitorsAMD (1, &monitor->id);
-               monitor_next = monitor->next;
-               free (monitor);
-       }
-       metrics->monitor_head = NULL;
-       metrics->monitor_tail = NULL;
-
-       metrics->monitors_in_flight = 0;
-}
-
-void
-metrics_destroy (metrics_t *metrics)
-{
-       metrics_fini (metrics);
-
-       free (metrics);
-}