Limit GL version to 2.0 for OOPR on android via finch flag.

1. Remove existing gpu driver bug workaround.
2. Add a finch feature flag to enable this workaround instead.

Bug: 1031383
Change-Id: I0934bd8934bd12b5dfe5cf565b5173b68851a099
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2152893
Commit-Queue: Khushal <khushalsagar@chromium.org>
Reviewed-by: Khushal <khushalsagar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#766522}

gpu/command_buffer/service/shared_context_state.cc

@@ -8,6 +8,7 @@
 #include "base/system/sys_info.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/memory_dump_manager.h"
+#include "build/build_config.h"
 #include "components/crash/core/common/crash_key.h"
 #include "gpu/command_buffer/common/activity_flags.h"
 #include "gpu/command_buffer/service/context_state.h"
@@ -31,6 +32,10 @@
 #include "gpu/vulkan/vulkan_device_queue.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include "gpu/config/gpu_finch_features.h"
+#endif
+
 #if defined(OS_FUCHSIA)
 #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h"
 #endif
@@ -206,9 +211,12 @@ void SharedContextState::InitializeGrContext(
 
   if (GrContextIsGL()) {
     DCHECK(context_->IsCurrent(nullptr));
+    bool use_version_es2 = false;
+#if defined(OS_ANDROID)
+    use_version_es2 = base::FeatureList::IsEnabled(features::kUseGles2ForOopR);
+#endif
     sk_sp<GrGLInterface> interface(gl::init::CreateGrGLInterface(
-        *context_->GetVersionInfo(), workarounds.use_es2_for_oopr,
-        progress_reporter));
+        *context_->GetVersionInfo(), use_version_es2, progress_reporter));
     if (!interface) {
       LOG(ERROR) << "OOP raster support disabled: GrGLInterface creation "
                     "failed.";

gpu/command_buffer/service/skia_utils.cc

@@ -5,6 +5,7 @@
 #include "gpu/command_buffer/service/skia_utils.h"
 
 #include "base/logging.h"
+#include "build/build_config.h"
 #include "components/viz/common/gpu/vulkan_context_provider.h"
 #include "components/viz/common/resources/resource_format_utils.h"
 #include "gpu/command_buffer/service/feature_info.h"
@@ -17,6 +18,10 @@
 #include "ui/gl/gl_gl_api_implementation.h"
 #include "ui/gl/gl_version_info.h"
 
+#if defined(OS_ANDROID)
+#include "gpu/config/gpu_finch_features.h"
+#endif
+
 #if BUILDFLAG(ENABLE_VULKAN)
 #include "gpu/vulkan/vulkan_device_queue.h"
 #include "gpu/vulkan/vulkan_fence_helper.h"
@@ -90,9 +95,13 @@ GLuint GetGrGLBackendTextureFormat(const gles2::FeatureInfo* feature_info,
   GLuint internal_format = gl::GetInternalFormat(
       version_info, viz::TextureStorageFormat(resource_format));
 
+  bool use_version_es2 = false;
+#if defined(OS_ANDROID)
+  use_version_es2 = base::FeatureList::IsEnabled(features::kUseGles2ForOopR);
+#endif
+
   // We tell Skia to use es2 which does not have GL_R8_EXT
-  if (feature_info->gl_version_info().is_es3 &&
-      feature_info->workarounds().use_es2_for_oopr) {
+  if (feature_info->gl_version_info().is_es3 && use_version_es2) {
     if (internal_format == GL_R8_EXT)
       internal_format = GL_LUMINANCE8;
   }

gpu/config/gpu_driver_bug_list.json

@@ -2867,17 +2867,6 @@
         "disable_timestamp_queries"
       ]
     },
-    {
-      "id":273,
-      "cr_bugs": [866613, 860021],
-      "description": "Frequent crashes on Adreno (TM) on L and below",
-      "os": {
-        "type": "android"
-      },
-      "features": [
-        "use_es2_for_oopr"
-      ]
-    },
     {
       "id": 274,
       "description": "glTexStorage* are buggy when base mipmap level is not 0",

gpu/config/gpu_finch_features.cc

@@ -16,6 +16,10 @@ namespace features {
 // Used only by webview to disable SurfaceControl.
 const base::Feature kDisableSurfaceControlForWebview{
     "DisableSurfaceControlForWebview", base::FEATURE_DISABLED_BY_DEFAULT};
+
+// Used to limit GL version to 2.0 for skia raster on Android.
+const base::Feature kUseGles2ForOopR{"UseGles2ForOopR",
+                                     base::FEATURE_ENABLED_BY_DEFAULT};
 #endif
 
 // Enable GPU Rasterization by default. This can still be overridden by

gpu/config/gpu_finch_features.h

@@ -18,6 +18,8 @@ namespace features {
 // alongside the definition of their values in the .cc file.
 #if defined(OS_ANDROID)
 GPU_EXPORT extern const base::Feature kDisableSurfaceControlForWebview;
+
+GPU_EXPORT extern const base::Feature kUseGles2ForOopR;
 #endif  // defined(OS_ANDROID)
 
 GPU_EXPORT extern const base::Feature kDefaultEnableGpuRasterization;