Fixes for GLES systems.

client/deps/glbench/src/windowmanagercompositingtest.cc

Index: client/deps/glbench/src/windowmanagercompositingtest.cc
diff --git a/client/deps/glbench/src/windowmanagercompositingtest.cc b/client/deps/glbench/src/windowmanagercompositingtest.cc
index f394fdc29e98059bab70bc32066c591d20b93a07..a791093a21f68e8e7642dbb6e059b48a623999c6 100644
--- a/client/deps/glbench/src/windowmanagercompositingtest.cc
+++ b/client/deps/glbench/src/windowmanagercompositingtest.cc
@@ -34,11 +34,9 @@ class WindowManagerCompositingTest : public TestBase {
   bool scissor_;
   uint32_t texture_base_[WINDOW_HEIGHT*WINDOW_WIDTH];
   uint32_t texture_update_[WINDOW_HEIGHT*WINDOW_WIDTH];
-#ifndef USE_EGL
   GLuint compositing_textures_[5];
   GLuint compositing_background_program_;
   GLuint compositing_foreground_program_;
-#endif
   DISALLOW_COPY_AND_ASSIGN(WindowManagerCompositingTest);
 };
 
@@ -124,7 +122,7 @@ bool WindowManagerCompositingTest::TestFunc(int iter) {
   return true;
 }
 
-#if I915_WORKAROUND
+#if defined(I915_WORKAROUND)
 #define V1 "gl_TexCoord[0]"
 #define V2 "gl_TexCoord[1]"
 #define V3 "gl_TexCoord[2]"