Push oustanding-counter data down from context.c into metrics.c

[fips] / metrics.h

diff --git a/metrics.h b/metrics.h
index accafe5f8e91f2660e46687dfc39cbf959b107cc..26de580d517066856133971fb5ac7641fb7559be 100644 (file)
--- a/metrics.h
+++ b/metrics.h
@@ -50,14 +50,70 @@ typedef enum
        METRICS_OP_SHADER
 } metrics_op_t;
 
-/* Initialize metrics info
- *
- * This queries the names and ranges for all available performance counters.
- *
- * This should be called once before any other metrics functions.
- */
+/* Timer query */
+typedef struct timer_query
+{
+       unsigned id;
+
+       metrics_op_t op;
+       struct timer_query *next;
+} timer_query_t;
+
+/* Performance-monitor query */
+typedef struct monitor
+{
+       unsigned id;
+
+       metrics_op_t op;
+       struct monitor *next;
+} monitor_t;
+
+typedef struct op_metrics
+{
+       /* This happens to also be the index into the
+        * ctx->op_metrics array currently
+        */
+       metrics_op_t op;
+       double time_ns;
+
+       double **counters;
+} op_metrics_t;
+
+typedef struct metrics
+{
+       metrics_op_t op;
+
+       /* GL_TIME_ELAPSED query for which glEndQuery has not yet
+        * been called. */
+       unsigned timer_begun_id;
+
+       /* GL_TIME_ELAPSED queries for which glEndQuery has been
+        * called, (but results have not yet been queried). */
+       timer_query_t *timer_head;
+       timer_query_t *timer_tail;
+
+       /* Performance monitor for which glEndPerfMonitorAMD has not
+        * yet been called. */
+       unsigned monitor_begun_id;
+
+       /* Performance monitors for which glEndPerfMonitorAMD has
+        * been called, (but results have not yet been queried). */
+       monitor_t *monitor_head;
+       monitor_t *monitor_tail;
+
+       int monitors_in_flight;
+
+       unsigned num_op_metrics;
+       op_metrics_t *op_metrics;
+} metrics_t;
+
+/* Initialize a metrics_t object for tracking metrics. */
 void
-metrics_info_init (void);
+metrics_init (metrics_t *metrics);
+
+/* Cleanup a metrics_t object that's no longer needed. */
+void
+metrics_fini (metrics_t *metrics);
 
 /* Start accumulating GPU time.
  *
@@ -101,4 +157,18 @@ metrics_get_current_op (void);
 void
 metrics_end_frame (void);
 
+/* Process outstanding metrics requests, accumulating results.
+ *
+ * This function is called automatically by metrics_end_frame.
+ *
+ * During a frame, it may be important to call this function to avoid
+ * too many oustanding timer/performance-monitor queries. At the same
+ * time, it's important not to call this function too frequently,
+ * since collection of metrics information will result in flushes of
+ * the OpenGL pipeline which can interfere with the behavior being
+ * measured.
+ */
+void
+metrics_collect_available (void);
+
 #endif