X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=metrics.c;h=b6dbbd098b38672bdebb887ac58abf159baa1db6;hb=e42d9f224a4ef2784f8fd43f9f4f5c593a7ddd57;hp=f4c0a2150f05b2092031a17907da231631b09bd4;hpb=c0c549440d852153d1777eca3fa962c1b70483b3;p=fips

diff --git a/metrics.c b/metrics.c
index f4c0a21..b6dbbd0 100644
--- a/metrics.c
+++ b/metrics.c
@@ -141,28 +141,16 @@ metrics_end_frame (void)
 
 
 	frames++;
-
-	if (frames % 60 == 0) {
-		double fps;
-		gettimeofday (&tv_now, NULL);
-
-		fps = (double) frames / (tv_now.tv_sec - tv_start.tv_sec +
-					 (tv_now.tv_usec - tv_start.tv_usec) / 1.0e6);
-
-		printf("FPS: %.3f\n", fps);
-
-		print_program_metrics ();
-	}
+	gettimeofday (&tv_now, NULL);
 
 	/* Consume all counters that are ready. */
 	counter_t *counter = current_context.counter_head;
 
 	while (counter) {
-		GLint available;
-		GLuint elapsed;
+		GLuint available, elapsed;
 
-		glGetQueryObjectiv (counter->id, GL_QUERY_RESULT_AVAILABLE,
-				    &available);
+		glGetQueryObjectuiv (counter->id, GL_QUERY_RESULT_AVAILABLE,
+				     &available);
 		if (! available)
 			break;
 
@@ -179,4 +167,15 @@ metrics_end_frame (void)
 		free (counter);
 		counter = current_context.counter_head;
 	}
+
+	if (frames % 60 == 0) {
+		double fps;
+
+		fps = (double) frames / (tv_now.tv_sec - tv_start.tv_sec +
+					 (tv_now.tv_usec - tv_start.tv_usec) / 1.0e6);
+
+		printf("FPS: %.3f\n", fps);
+
+		print_program_metrics ();
+	}
 }