From 2ddfc599cf1f15f2eec12ddb24754fe768b38e03 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Tue, 15 Oct 2013 13:20:33 -0700
Subject: [PATCH] Simplify metrics interface by dropping metrics_counter_new

None of the callers of this function were doing anything with the
returned value other than passing it directly to
metrics_counter_start. So it's simpler to just fold the contents of
the metrics_counter_new function into the body of
metrics_counter_start itself.
---
 glwrap.c  | 13 +++----------
 metrics.c | 12 +++---------
 metrics.h | 13 +++----------
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/glwrap.c b/glwrap.c
index 3c751cc..ebe7e54 100644
--- a/glwrap.c
+++ b/glwrap.c
@@ -111,9 +111,7 @@ glwrap_lookup (char *name)
 /* Execute an OpenGL call and time it with a GPU metrics counter. */
 #define TIMED_DEFER(function,...) do {					\
 	if (! inside_new_list) {					\
-		unsigned counter;					\
-		counter = metrics_counter_new ();			\
-		metrics_counter_start (counter);			\
+		metrics_counter_start ();				\
 	}								\
 	GLWRAP_DEFER(function, __VA_ARGS__);				\
 	if (! inside_new_list) {					\
@@ -386,11 +384,7 @@ void
 glBegin (GLenum mode)
 {
 	if (! inside_new_list)
-	{
-		unsigned counter;
-		counter = metrics_counter_new ();
-		metrics_counter_start (counter);
-	}
+		metrics_counter_start ();
 
 	GLWRAP_DEFER (glBegin, mode);
 }
@@ -400,9 +394,8 @@ glEnd (void)
 {
 	GLWRAP_DEFER (glEnd);
 
-	if (! inside_new_list) {
+	if (! inside_new_list)
 		metrics_counter_stop ();
-	}
 }
 
 /* And we need to track display lists to avoid inserting queries
diff --git a/metrics.c b/metrics.c
index e00bb63..39c90ad 100644
--- a/metrics.c
+++ b/metrics.c
@@ -65,8 +65,8 @@ context_t current_context;
 int frames;
 int verbose;
 
-unsigned
-metrics_counter_new (void)
+void
+metrics_counter_start (void)
 {
 	counter_t *counter;
 
@@ -89,13 +89,7 @@ metrics_counter_new (void)
 		current_context.counter_head = counter;
 	}
 
-	return counter->id;
-}
-
-void
-metrics_counter_start (unsigned counter)
-{
-	glBeginQuery (GL_TIME_ELAPSED, counter);
+	glBeginQuery (GL_TIME_ELAPSED, counter->id);
 }
 
 void
diff --git a/metrics.h b/metrics.h
index 2d93d90..8b68867 100644
--- a/metrics.h
+++ b/metrics.h
@@ -22,20 +22,13 @@
 #ifndef METRICS_H
 #define METRICS_H
 
-/* Add a new counter to the metrics tracking state.
+/* Start accumulating GPU time.
  *
- * The value accumulated in this counter be accounted against the
+ * The time accumulated will be accounted against the
  * current program (as set with metrics_set_current_program).
- *
- * Returns: A counter ID suitable for use with metrics_counter_start
- * and metrics_counter_stop.
  */
-unsigned
-metrics_counter_new (void);
-
-/* Start accumulating GPU time spent into the given counter. */
 void
-metrics_counter_start (unsigned counter);
+metrics_counter_start (void);
 
 /* Stop accumulating GPU time (stops the most-recently started counter) */
 void
-- 
2.43.0