Merge 195349 "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_number_conversions.h"
@@ skipping 77 matching lines @@
 
 FeatureInfo::Workarounds::Workarounds()
     : clear_alpha_in_readpixels(false),
       needs_glsl_built_in_function_emulation(false),
       needs_offscreen_buffer_workaround(false),
       reverse_point_sprite_coord_origin(false),
       set_texture_filter_before_generating_mipmap(false),
       use_current_program_after_successful_link(false),
       restore_scissor_on_fbo_change(false),
       flush_on_context_switch(false),
+      makecurrent_recreates_surfaces(false),
       delete_instead_of_resize_fbo(false),
       use_client_side_arrays_for_stream_buffers(false),
       max_texture_size(0),
       max_cube_map_texture_size(0) {
 }
 
 FeatureInfo::FeatureInfo() {
   static const GLenum kAlphaTypes[] = {
       GL_UNSIGNED_BYTE,
   };
@@ skipping 57 matching lines @@
     GL_VENDOR,
     GL_RENDERER,
   };
   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;
   for (size_t ii = 0; ii < arraysize(string_ids); ++ii) {
     const char* str = reinterpret_cast<const char*>(
           glGetString(string_ids[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");
     }
   }
 
   feature_flags_.disable_workarounds =
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableGpuDriverBugWorkarounds);
 
   feature_flags_.enable_shader_name_hashing =
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableShaderNameHashing);
@@ skipping 451 matching lines @@
       workarounds_.use_current_program_after_successful_link = true;
     }
 
     if (is_qualcomm) {
       workarounds_.restore_scissor_on_fbo_change = true;
       workarounds_.flush_on_context_switch = true;
       // This is only needed on the ICS driver.
       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;
     }
 
     // Limit Intel on Mac to 4096 max tex size and 1024 max cube map tex size.
@@ skipping 38 matching lines @@
   if (extensions_.find(str) == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 FeatureInfo::~FeatureInfo() {
 }
 
 }  // namespace gles2
 }  // namespace gpu