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

client/deps/glbench/src/egl_stuff.cc

 // 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.
 
 #include <EGL/egl.h>
 
 #include "base/logging.h"
 #include "main.h"
 #include "xlib_window.h"
 
@@ skipping 65 matching lines @@
   EGLContext egl_context = eglCreateContext(egl_display, egl_config,
                                             NULL, NULL);
   CHECK_EGL();
 
   eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context);
   CHECK_EGL();
 
   eglQuerySurface(egl_display, egl_surface, EGL_WIDTH, &g_width);
   eglQuerySurface(egl_display, egl_surface, EGL_HEIGHT, &g_height);
 
+#ifndef USE_EGL
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
+#endif
 
   return true;
 }
 
 void DestroyContext() {
   eglMakeCurrent(egl_display, NULL, NULL, NULL);
   eglDestroyContext(egl_display, egl_context);
 }
 
 void TerminateGL() {
   eglDestroySurface(egl_display, egl_surface);
   eglTerminate(egl_display);
 }
 
 void SwapBuffers() {
   eglSwapBuffers(egl_display, egl_surface);
 }
 
 bool SwapInterval(int interval) {
   return eglSwapInterval(egl_display, interval) == EGL_TRUE;
 }