Fixes for GLES systems.

client/deps/glbench/src/teartest.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 <gflags/gflags.h>
 #include <map>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ skipping 186 matching lines @@
   glEnableVertexAttribArray(attribute_index);
 
   int texture_sampler = glGetUniformLocation(program, "tex");
   glUniform1f(texture_sampler, 0);
 
   // UniformTest needs a uniform from the shader program.  Get the uniform
   // and instantiate the test.
   Test* uniform_test = GetUniformTest(glGetUniformLocation(program, "shift"));
   test_map["uniform"] = uniform_test;
   test_map["teximage2d"] = GetTexImage2DTest();
-#ifdef USE_EGL
+#if defined(USE_OPENGLES)
   test_map["pixmap_to_texture"] = GetPixmapToTextureTestEGL();
-#else
+#elif defined(USE_OPENGL)
   test_map["pixmap_to_texture"] = GetPixmapToTextureTest();
 #endif
 
   SwapInterval(sleep_duration ? 0 : 1);
 
   std::vector<std::string> tests;
   SplitString(FLAGS_tests, ',', &tests);
 
   int return_code = 0;
   for (std::vector<std::string>::iterator it = tests.begin();
@@ skipping 31 matching lines @@
 
     t->Stop();
   }
 
   // TODO: cleaner teardown.
 
   glDeleteTextures(1, &texture);
   DestroyContext();
   return return_code;
 }