X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=metrics.c;h=84fc23f6b20b02a2a15ece51ee9b63447d4e5466;hb=5381d581fe6d0c79a485f3179cd5505b7efb9336;hp=8d2d6444beae601b9de93eea5d503a91729321c0;hpb=502f6bd8e44c3645852c5bdf485ae9f5e2eb245d;p=fips

diff --git a/metrics.c b/metrics.c
index 8d2d644..84fc23f 100644
--- a/metrics.c
+++ b/metrics.c
@@ -24,8 +24,7 @@
 
 #include <sys/time.h>
 
-#define GL_GLEXT_PROTOTYPES
-#include <GL/gl.h>
+#include "fips-dispatch-gl.h"
 
 #include "metrics.h"
 
@@ -59,7 +58,7 @@ typedef struct context
 context_t current_context;
 
 unsigned
-metrics_add_counter (void)
+metrics_counter_new (void)
 {
 	counter_t *counter;
 
@@ -85,6 +84,18 @@ metrics_add_counter (void)
 	return counter->id;
 }
 
+void
+metrics_counter_start (unsigned counter)
+{
+	glBeginQuery (GL_TIME_ELAPSED, counter);
+}
+
+void
+metrics_counter_stop (void)
+{
+	glEndQuery (GL_TIME_ELAPSED);
+}
+
 void
 metrics_set_current_program (unsigned program)
 {
@@ -147,11 +158,10 @@ metrics_end_frame (void)
 	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;