Remove two gpu workarounds

clear_to_zero_or_one_broken
reset_teximage2d_base_level

They were only used for non-ANGLE paths.

TEST=bots
R=kbr@chromium.org

Bug: 1136972,710443,705865
Change-Id: Ia31396809373211d0f369399540d3ce476644909
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4863062
Commit-Queue: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Auto-Submit: Zhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1197236}

Author: Zhenyao Mo

gpu/config/gpu_driver_bug_list.json

@@ -2055,39 +2055,6 @@
         "rely_on_implicit_sync_for_swap_buffers"
       ]
     },
-    {
-      "id": 236,
-      "description": "glClearColor does not always work on Intel 6xxx Mac drivers",
-      "cr_bugs": [710443],
-      "os": {
-        "type": "macosx",
-        "version": {
-          "op": "<",
-          "value": "10.12.6"
-        }
-      },
-      "vendor_id": "0x8086",
-      "device_id": ["0x1626", "0x162B", "0x1622"],
-      "features": [
-        "clear_to_zero_or_one_broken"
-      ]
-    },
-    {
-      "id": 239,
-      "description": "Reset TexImage2D base level to 0 on Intel Mac 10.12.4",
-      "cr_bugs": [705865],
-      "os": {
-        "type": "macosx",
-        "version": {
-          "op": ">=",
-          "value": "10.12.4"
-        }
-      },
-      "vendor_id": "0x8086",
-      "features": [
-        "reset_teximage2d_base_level"
-      ]
-    },
     {
       "id": 240,
       "cr_bugs": [750306, 764526],

gpu/config/gpu_feature_info.cc

@@ -7,7 +7,6 @@
 #include "base/containers/contains.h"
 #include "gpu/config/gpu_blocklist.h"
 #include "gpu/config/gpu_driver_bug_list.h"
-#include "gpu/config/gpu_driver_bug_workaround_type.h"
 #include "ui/gl/gl_context.h"
 
 namespace gpu {
@@ -29,14 +28,6 @@ GpuFeatureInfo& GpuFeatureInfo::operator=(GpuFeatureInfo&&) = default;
 
 void GpuFeatureInfo::ApplyToGLContext(gl::GLContext* gl_context) const {
   DCHECK(gl_context);
-  gl::GLWorkarounds gl_workarounds;
-  if (IsWorkaroundEnabled(gpu::CLEAR_TO_ZERO_OR_ONE_BROKEN)) {
-    gl_workarounds.clear_to_zero_or_one_broken = true;
-  }
-  if (IsWorkaroundEnabled(RESET_TEXIMAGE2D_BASE_LEVEL)) {
-    gl_workarounds.reset_teximage2d_base_level = true;
-  }
-  gl_context->SetGLWorkarounds(gl_workarounds);
   gl_context->SetDisabledGLExtensions(this->disabled_extensions);
 }
 

gpu/config/gpu_workaround_list.txt

@@ -9,7 +9,6 @@ check_egl_fence_before_wait
 check_ycbcr_studio_g22_left_p709_for_nv12_support
 clamp_texture_base_level_and_max_level
 clear_pixel_unpack_buffer_before_copyteximage
-clear_to_zero_or_one_broken
 clear_uniforms_before_first_program_use
 count_all_in_varyings_packing
 decode_encode_srgb_for_generatemipmap
@@ -119,7 +118,6 @@ rely_on_implicit_sync_for_swap_buffers
 remove_dynamic_indexing_of_swizzled_vector
 remove_invariant_and_centroid_for_essl3
 reset_base_mipmap_level_before_texstorage
-reset_teximage2d_base_level
 restore_scissor_on_fbo_change
 rewrite_do_while_loops
 rewrite_float_unary_minus_operator

gpu/ipc/service/command_buffer_stub.cc

@@ -43,7 +43,6 @@
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_switches.h"
-#include "ui/gl/gl_workarounds.h"
 #include "ui/gl/init/gl_factory.h"
 
 #if BUILDFLAG(IS_WIN)

gpu/ipc/service/gles2_command_buffer_stub.cc

@@ -50,7 +50,6 @@
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/gl_utils.h"
-#include "ui/gl/gl_workarounds.h"
 #include "ui/gl/init/gl_factory.h"
 
 #if BUILDFLAG(IS_WIN)

gpu/ipc/service/raster_command_buffer_stub.cc

@@ -31,7 +31,6 @@
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_switches.h"
-#include "ui/gl/gl_workarounds.h"
 #include "ui/gl/init/gl_factory.h"
 
 #if BUILDFLAG(IS_WIN)

gpu/ipc/service/webgpu_command_buffer_stub.cc

@@ -33,7 +33,6 @@
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_switches.h"
-#include "ui/gl/gl_workarounds.h"
 #include "ui/gl/init/gl_factory.h"
 
 #if BUILDFLAG(IS_WIN)

ui/gl/BUILD.gn

@@ -109,7 +109,6 @@ component("gl") {
     "gl_utils.h",
     "gl_version_info.cc",
     "gl_version_info.h",
-    "gl_workarounds.h",
     "gpu_switching_manager.cc",
     "gpu_switching_manager.h",
     "gpu_timing.cc",

ui/gl/gl_context.cc

@@ -113,7 +113,6 @@ bool GLContext::MakeCurrent(GLSurface* surface) {
 
 GLApi* GLContext::CreateGLApi(DriverGL* driver) {
   real_gl_api_ = new RealGLApi;
-  real_gl_api_->set_gl_workarounds(gl_workarounds_);
   real_gl_api_->SetDisabledExtensions(disabled_gl_extensions_);
   real_gl_api_->Initialize(driver);
   return real_gl_api_;
@@ -367,11 +366,6 @@ void GLContext::SetCurrent(GLSurface* surface) {
   }
 }
 
-void GLContext::SetGLWorkarounds(const GLWorkarounds& workarounds) {
-  DCHECK(!real_gl_api_);
-  gl_workarounds_ = workarounds;
-}
-
 void GLContext::SetDisabledGLExtensions(
     const std::string& disabled_extensions) {
   DCHECK(!real_gl_api_);

ui/gl/gl_context.h

@@ -21,7 +21,6 @@
 #include "ui/gl/gl_implementation_wrapper.h"
 #include "ui/gl/gl_share_group.h"
 #include "ui/gl/gl_state_restorer.h"
-#include "ui/gl/gl_workarounds.h"
 #include "ui/gl/gpu_preference.h"
 
 namespace gl {
@@ -164,9 +163,6 @@ class GL_EXPORT GLContext : public base::RefCounted<GLContext>,
   // Creates a GPUTimingClient class which abstracts various GPU Timing exts.
   virtual scoped_refptr<GPUTimingClient> CreateGPUTimingClient() = 0;
 
-  // Set the GL workarounds.
-  void SetGLWorkarounds(const GLWorkarounds& workarounds);
-
   void SetDisabledGLExtensions(const std::string& disabled_gl_extensions);
 
   // Gets the GLStateRestorer for the context.
@@ -329,7 +325,6 @@ class GL_EXPORT GLContext : public base::RefCounted<GLContext>,
 
   static bool switchable_gpus_supported_;
 
-  GLWorkarounds gl_workarounds_;
   std::string disabled_gl_extensions_;
 
   bool static_bindings_initialized_ = false;

ui/gl/gl_gl_api_implementation.cc

@@ -310,21 +310,6 @@ void RealGLApi::glTexImage2DFn(GLenum target,
   GLenum gl_format = GetTexFormat(version_.get(), format);
   GLenum gl_type = GetPixelType(version_.get(), type, format);
 
-  // TODO(yizhou): Check if cubemap, 3d texture or texture2d array has the same
-  // bug on intel mac.
-  if (!version_->is_angle && gl_workarounds_.reset_teximage2d_base_level &&
-      target == GL_TEXTURE_2D) {
-    GLint base_level = 0;
-    GLApiBase::glGetTexParameterivFn(target, GL_TEXTURE_BASE_LEVEL,
-                                     &base_level);
-    if (base_level) {
-      GLApiBase::glTexParameteriFn(target, GL_TEXTURE_BASE_LEVEL, 0);
-      GLApiBase::glTexImage2DFn(target, level, gl_internal_format, width,
-                                height, border, gl_format, gl_type, pixels);
-      GLApiBase::glTexParameteriFn(target, GL_TEXTURE_BASE_LEVEL, base_level);
-      return;
-    }
-  }
   GLApiBase::glTexImage2DFn(target, level, gl_internal_format, width, height,
                             border, gl_format, gl_type, pixels);
 }
@@ -435,21 +420,6 @@ void RealGLApi::glClearFn(GLbitfield mask) {
   }
 }
 
-void RealGLApi::glClearColorFn(GLclampf red,
-                               GLclampf green,
-                               GLclampf blue,
-                               GLclampf alpha) {
-  if (!version_->is_angle && gl_workarounds_.clear_to_zero_or_one_broken &&
-      (1 == red || 0 == red) && (1 == green || 0 == green) &&
-      (1 == blue || 0 == blue) && (1 == alpha || 0 == alpha)) {
-    if (1 == alpha)
-      alpha = 2;
-    else
-      alpha = -1;
-  }
-  GLApiBase::glClearColorFn(red, green, blue, alpha);
-}
-
 void RealGLApi::glDrawArraysFn(GLenum mode, GLint first, GLsizei count) {
   if (!g_null_draw_bindings_enabled) {
     GLApiBase::glDrawArraysFn(mode, first, count);
@@ -564,10 +534,6 @@ void RealGLApi::ClearCachedGLExtensions() {
   filtered_exts_str_.clear();
 }
 
-void RealGLApi::set_gl_workarounds(const GLWorkarounds& workarounds) {
-  gl_workarounds_ = workarounds;
-}
-
 void RealGLApi::set_version(std::unique_ptr<GLVersionInfo> version) {
   version_ = std::move(version);
 }

ui/gl/gl_gl_api_implementation.h

@@ -11,7 +11,6 @@
 #include "base/memory/raw_ptr.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_export.h"
-#include "ui/gl/gl_workarounds.h"
 
 namespace gl {
 
@@ -130,10 +129,6 @@ class GL_EXPORT RealGLApi : public GLApiBase {
                       void* pixels) override;
 
   void glClearFn(GLbitfield mask) override;
-  void glClearColorFn(GLclampf red,
-                      GLclampf green,
-                      GLclampf blue,
-                      GLclampf alpha) override;
   void glDrawArraysFn(GLenum mode, GLint first, GLsizei count) override;
   void glDrawElementsFn(GLenum mode,
                         GLsizei count,
@@ -145,7 +140,6 @@ class GL_EXPORT RealGLApi : public GLApiBase {
 
   void glUseProgramFn(GLuint program) override;
 
-  void set_gl_workarounds(const GLWorkarounds& workarounds);
   void set_version(std::unique_ptr<GLVersionInfo> version);
   void ClearCachedGLExtensions();
 
@@ -159,7 +153,6 @@ class GL_EXPORT RealGLApi : public GLApiBase {
   std::vector<std::string> filtered_exts_;
   std::string filtered_exts_str_;
 
-  GLWorkarounds gl_workarounds_;
   std::unique_ptr<GLVersionInfo> version_;
 };