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

client/deps/glbench/src/main.h

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BENCH_GL_MAIN_H_
 #define BENCH_GL_MAIN_H_
 
 #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>
 
 #define LIST_PROC_FUNCTIONS(F) \
     F(glAttachShader, PFNGLATTACHSHADERPROC) \
     F(glBindBuffer, PFNGLBINDBUFFERPROC) \
     F(glBufferData, PFNGLBUFFERDATAPROC) \
     F(glCompileShader, PFNGLCOMPILESHADERPROC) \
     F(glCreateProgram, PFNGLCREATEPROGRAMPROC) \
     F(glCreateShader, PFNGLCREATESHADERPROC) \
     F(glDeleteBuffers, PFNGLDELETEBUFFERSPROC) \
     F(glDeleteProgram, PFNGLDELETEPROGRAMPROC) \
     F(glDeleteShader, PFNGLDELETESHADERPROC) \
     F(glEnableVertexAttribArray, PFNGLENABLEVERTEXATTRIBARRAYPROC) \
     F(glGenBuffers, PFNGLGENBUFFERSPROC) \
     F(glGetAttribLocation, PFNGLGETATTRIBLOCATIONPROC) \
     F(glGetInfoLogARB, PFNGLGETPROGRAMINFOLOGPROC) \
+    F(glGetProgramInfoLog, PFNGLGETPROGRAMINFOLOGPROC) \
+    F(glGetShaderInfoLog, PFNGLGETSHADERINFOLOGPROC) \
     F(glGetUniformLocation, PFNGLGETUNIFORMLOCATIONPROC) \
     F(glLinkProgram, PFNGLLINKPROGRAMPROC) \
     F(glShaderSource, PFNGLSHADERSOURCEPROC) \
     F(glUniform1f, PFNGLUNIFORM1FPROC) \
     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)
 #undef F
 
 #endif
 
 inline uint64_t GetUTime() {
   struct timeval tv;
   gettimeofday(&tv, NULL);
@@ skipping 28 matching lines @@
 // that:
 //   time it took to run x iterations = slope * x + bias
 // Returns false if one iteration of the test takes longer than
 // MAX_ITERATION_LENGTH_MS.  The test is then assumed too slow to provide
 // meaningful results.
 bool Bench(BenchFunc func, float *slope, int64_t *bias);
 
 void *MmapFile(const char *name, size_t *length);
 
 #endif  // BENCH_GL_MAIN_H_