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

client/deps/glbench/src/main.h

Index: client/deps/glbench/src/main.h
diff --git a/client/deps/glbench/src/main.h b/client/deps/glbench/src/main.h
index 42d0ed8f96243960e8233e2544d912b6eb0f1bf6..d103f1e2515572adf1e141064cdc4db5b075d68d 100644
--- a/client/deps/glbench/src/main.h
+++ b/client/deps/glbench/src/main.h
@@ -8,9 +8,9 @@
 #include <gflags/gflags.h>
 #include <sys/time.h>
 
-#ifdef USE_GLES
+#ifdef USE_EGL
+#include <GLES2/gl2.h>
 #include <EGL/egl.h>
-#include <GLES/gl.h>
 #else
 #include <GL/gl.h>
 #include <GL/glx.h>
@@ -29,6 +29,8 @@
     F(glGenBuffers, PFNGLGENBUFFERSPROC) \
     F(glGetAttribLocation, PFNGLGETATTRIBLOCATIONPROC) \
     F(glGetInfoLogARB, PFNGLGETPROGRAMINFOLOGPROC) \
+    F(glGetProgramInfoLog, PFNGLGETPROGRAMINFOLOGPROC) \
+    F(glGetShaderInfoLog, PFNGLGETSHADERINFOLOGPROC) \
     F(glGetUniformLocation, PFNGLGETUNIFORMLOCATIONPROC) \
     F(glLinkProgram, PFNGLLINKPROGRAMPROC) \
     F(glShaderSource, PFNGLSHADERSOURCEPROC) \
@@ -36,7 +38,9 @@
     F(glUniform1i, PFNGLUNIFORM1IPROC) \
     F(glUseProgram, PFNGLUSEPROGRAMPROC) \
     F(glVertexAttribPointer, PFNGLVERTEXATTRIBPOINTERPROC) \
-    F(glXSwapIntervalSGI, PFNGLXSWAPINTERVALSGIPROC)
+    F(glXSwapIntervalSGI, PFNGLXSWAPINTERVALSGIPROC) \
+    F(glXBindTexImageEXT, PFNGLXBINDTEXIMAGEEXTPROC) \
+    F(glXReleaseTexImageEXT, PFNGLXRELEASETEXIMAGEEXTPROC)
 
 #define F(fun, type) extern type fun;
 LIST_PROC_FUNCTIONS(F)