Fixes for GLES systems.

client/deps/glbench/src/windowmanagercompositingtest.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 <stdio.h>
 
 #include "main.h"
 #include "testbase.h"
 #include "utils.h"
 
@@ skipping 16 matching lines @@
   void InitializeCompositing();
   void TeardownCompositing();
   void InitBaseTexture();
   void UpdateTexture();
   void LoadTexture();
 
  private:
   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);
 };
 
 TestBase* GetWindowManagerCompositingTest(bool enable_scissor) {
   return new WindowManagerCompositingTest(enable_scissor);
 }
 
 bool WindowManagerCompositingTest::Run() {
   const char* testname = "1280x768_fps_compositing";
   if (scissor_) {
@@ skipping 65 matching lines @@
     // This is a static window, so we don't update it.
     glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, compositing_textures_[4]);
     // TODO(papakipos): add color interpolation here, and modulate
     // texture against it.
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
   }
   return true;
 }
 
-#if I915_WORKAROUND
+#if defined(I915_WORKAROUND)
 #define V1 "gl_TexCoord[0]"
 #define V2 "gl_TexCoord[1]"
 #define V3 "gl_TexCoord[2]"
 #else
 #define V1 "v1"
 #define V2 "v2"
 #define V3 "v3"
 #endif
 
 const char *kBasicTextureVertexShader =
@@ skipping 273 matching lines @@
 }
 
 void WindowManagerCompositingTest::LoadTexture() {
   // Use GL_RGBA for compatibility with GLES2.0.
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
                WINDOW_WIDTH, WINDOW_HEIGHT, 0,
                GL_RGBA, GL_UNSIGNED_BYTE, texture_update_);
 }
 
 } // namespace glbench