Split tests into individual files. Got rid of globals by converting them to classes.

client/deps/glbench/src/utils.h

Index: client/deps/glbench/src/utils.h
diff --git a/client/deps/glbench/src/utils.h b/client/deps/glbench/src/utils.h
index 44d11823725b3d6003a5e94f5ea36dde2f80219a..117454c5063c208c987e03e655519ece504d7b31 100644
--- a/client/deps/glbench/src/utils.h
+++ b/client/deps/glbench/src/utils.h
@@ -14,6 +14,19 @@
 
 void SetBasePathFromArgv0(const char* argv0, const char* relative);
 void *MmapFile(const char *name, size_t *length);
+
+namespace glbench {
+
+GLuint SetupTexture(GLsizei size_log2);
+GLuint SetupVBO(GLenum target, GLsizeiptr size, const GLvoid *data);
+void CreateLattice(GLfloat **vertices, GLsizeiptr *size,
+                   GLfloat size_x, GLfloat size_y, int width, int height);
+int CreateMesh(GLuint **indices, GLsizeiptr *size,
+                      int width, int height, int culled_ratio);
 GLuint InitShaderProgram(const char *vertex_src, const char *fragment_src);
 
+#define I915_WORKAROUND 1
+
+} // namespace glbench
+
 #endif // BENCH_GL_UTILS_H_