Reland "gpu: Fix Vivante's "hisilicon" GPUs"

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/command_line.h"
 #include "base/string_util.h"
@@ skipping 173 matching lines @@
   // Once we migrate blacklisting stuff from src/content to src/gpu, we can
   // get the workarounds from json file. Then we should remove this block.
   // See crbug.com/228979.
   bool is_intel = false;
   bool is_nvidia = false;
   bool is_amd = false;
   bool is_mesa = false;
   bool is_qualcomm = false;
   bool is_imagination = false;
   bool is_arm = false;
+  bool is_hisilicon = false;

[epenner, 2013/04/19 04:13:14]

The three lines in this file is the only new code that will execute on other
platforms. The rest of the changes is new code which is never called (the
call-sites are #ifdef'd)

   const char* gl_strings[2];
   gl_strings[0] = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
   gl_strings[1] = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
   if (!command_line.HasSwitch(switches::kGpuDriverBugWorkarounds) &&
       !command_line.HasSwitch(switches::kDisableGpuDriverBugWorkarounds)) {
     for (size_t ii = 0; ii < arraysize(gl_strings); ++ii) {
       const char* str = gl_strings[ii];
       if (str) {
         std::string lstr(StringToLowerASCII(std::string(str)));
         StringSet string_set(lstr);
         is_intel |= string_set.Contains("intel");
         is_nvidia |= string_set.Contains("nvidia");
         is_amd |= string_set.Contains("amd") || string_set.Contains("ati");
         is_mesa |= string_set.Contains("mesa");
         is_qualcomm |= string_set.Contains("qualcomm");
         is_imagination |= string_set.Contains("imagination");
         is_arm |= string_set.Contains("arm");
+        is_hisilicon |= string_set.Contains("hisilicon");
       }
     }
 
     workarounds_.set_texture_filter_before_generating_mipmap = true;
     workarounds_.clear_alpha_in_readpixels = true;
     if (is_nvidia) {
       workarounds_.use_current_program_after_successful_link = true;
     }
     if (is_qualcomm) {
       workarounds_.restore_scissor_on_fbo_change = true;
       workarounds_.flush_on_context_switch = true;
       workarounds_.delete_instead_of_resize_fbo = true;
     }
+    if (is_hisilicon) {
+      workarounds_.makecurrent_recreates_surfaces = true;
+    }
 #if defined(OS_MACOSX)
     workarounds_.needs_offscreen_buffer_workaround = is_nvidia;
     workarounds_.needs_glsl_built_in_function_emulation = is_amd;
     if ((is_amd || is_intel) &&
         gfx::GetGLImplementation() == gfx::kGLImplementationDesktopGL) {
       workarounds_.reverse_point_sprite_coord_origin = true;
     }
     if (is_intel) {
       workarounds_.max_texture_size = 4096;
       workarounds_.max_cube_map_texture_size = 1024;
@@ skipping 478 matching lines @@
   if (extensions_.find(str) == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 FeatureInfo::~FeatureInfo() {
 }
 
 }  // namespace gles2
 }  // namespace gpu