Merge 128403 - Modify gpu::gles2::FeatureInfo::AddFeatures to enable feature flags based on request…

gpu/command_buffer/service/feature_info.cc

 // Copyright (c) 2012 The Chromium 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 "gpu/command_buffer/service/feature_info.h"
 
 #include <set>
 
 #include "base/string_number_conversions.h"
 #include "gpu/command_buffer/service/gl_utils.h"
@@ skipping 369 matching lines @@
 #if defined(OS_MACOSX)
   if (IOSurfaceSupport::Initialize()) {
     AddExtensionString("GL_CHROMIUM_iosurface");
   }
 #endif
 
   // TODO(gman): Add support for these extensions.
   //     GL_OES_depth32
   //     GL_OES_element_index_uint
 
-  feature_flags_.enable_texture_float_linear = enable_texture_float_linear;
-  feature_flags_.enable_texture_half_float_linear =
+  feature_flags_.enable_texture_float_linear |= enable_texture_float_linear;
+  feature_flags_.enable_texture_half_float_linear |=
       enable_texture_half_float_linear;
-  feature_flags_.npot_ok = npot_ok;
+  feature_flags_.npot_ok |= npot_ok;
 
   if (ext.HaveAndDesire("GL_CHROMIUM_post_sub_buffer")) {
     AddExtensionString("GL_CHROMIUM_post_sub_buffer");
   }
 
   if (ext.HaveAndDesire("GL_CHROMIUM_front_buffer_cached")) {
     AddExtensionString("GL_CHROMIUM_front_buffer_cached");
   }
 
   if (ext.Desire("GL_ANGLE_pack_reverse_row_order") &&
@@ skipping 36 matching lines @@
 }
 
 void FeatureInfo::AddExtensionString(const std::string& str) {
   if (extensions_.find(str) == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu