Replaced funky state machines with classes. This is in preparation of doing the same to gl_Bench.

client/deps/glbench/src/utils.cc

Index: client/deps/glbench/src/utils.cc
diff --git a/client/deps/glbench/src/utils.cc b/client/deps/glbench/src/utils.cc
index a214f5b6e1bbd1375ae6487c303f8979440c48d1..ea0d6e0f444307e89ce86493d0f37a59f496ac0d 100644
--- a/client/deps/glbench/src/utils.cc
+++ b/client/deps/glbench/src/utils.cc
@@ -51,7 +51,10 @@ static void print_info_log(int obj)
 {
   char info_log[4096];
   int length;
-  glGetInfoLogARB(obj, sizeof(info_log)-1, &length, info_log);
+  glGetError();
+  glGetShaderInfoLog(obj, sizeof(info_log)-1, &length, info_log);
+  if (glGetError() != 0)
+    glGetProgramInfoLog(obj, sizeof(info_log)-1, &length, info_log);
   char *p = info_log;
   while (p < info_log + length) {
     char *newline = strchr(p, '\n');