Clean up stuff from the vertex shader.

[movit] / util.h

diff --git a/util.h b/util.h
index 0d499453048d2e9bebb2ea50c8d56fd75c01c67d..ab0ee5d74fe2d26f4f1d8375d7975f8ccfede3c9 100644 (file)
--- a/util.h
+++ b/util.h
@@ -1,7 +1,23 @@
 #ifndef _UTIL_H
 #define _UTIL_H 1
 
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <string>
+
+#include <GL/gl.h>
+
 // assumes h in [0, 2pi> or [-pi, pi>
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b);
 
+std::string read_file(const std::string &filename);
+GLhandleARB compile_shader(const std::string &shader_src, GLenum type);
+
+#ifdef NDEBUG
+#define check_error()
+#else
+#define check_error() { int err = glGetError(); if (err != GL_NO_ERROR) { printf("GL error 0x%x at %s:%d\n", err, __FILE__, __LINE__); exit(1); } }
+#endif
+
 #endif // !defined(_UTIL_H)