Remove five macOS gpu workarounds.

zhenyao · Chromium LUCI CQ · commit a5d5158400db · 2023-09-19T18:43:52.000Z
* disable_overlay_ca_layers: no longer applies anywhere The following four workarounds apply to validating cmd buffer only: * emulate_abs_int_function * emulate_isnan_on_float * init_one_cube_map_level_before_copyteximage * init_two_cube_map_levels_before_copyteximage TEST=bots R=kbr@chrmoimu.org,geofflang@chromium.org Bug: 1136972,543324,580616,642227,648197,650547,828031 Change-Id: I25913447b9a1235bb352a075e7523ac819da687c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4869742 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@{#1198513}
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -3892,16 +3892,12 @@ bool GLES2DecoderImpl::InitializeShaderTranslator() {
     driver_bug_workarounds.scalarizeVecAndMatConstructorArgs = true;
   if (workarounds().regenerate_struct_names)
     driver_bug_workarounds.regenerateStructNames = true;
-  if (workarounds().emulate_abs_int_function)
-    driver_bug_workarounds.emulateAbsIntFunction = true;
   if (workarounds().rewrite_texelfetchoffset_to_texelfetch)
     driver_bug_workarounds.rewriteTexelFetchOffsetToTexelFetch = true;
   if (workarounds().add_and_true_to_loop_condition)
     driver_bug_workarounds.addAndTrueToLoopCondition = true;
   if (workarounds().rewrite_do_while_loops)
     driver_bug_workarounds.rewriteDoWhileLoops = true;
-  if (workarounds().emulate_isnan_on_float)
-    driver_bug_workarounds.emulateIsnanFloatFunction = true;
   if (workarounds().use_unused_standard_shared_blocks)
     driver_bug_workarounds.useUnusedStandardSharedBlocks = true;
   if (workarounds().remove_invariant_and_centroid_for_essl3)
@@ -14588,58 +14584,13 @@ void GLES2DecoderImpl::DoCopyTexImage2D(
       }
     }
   } else {
-    if (workarounds().init_two_cube_map_levels_before_copyteximage &&
-        texture->target() == GL_TEXTURE_CUBE_MAP &&
-        target != GL_TEXTURE_CUBE_MAP_POSITIVE_X) {
-      for (int i = 0; i < 2; ++i) {
-        TextureManager::DoTexImageArguments args = {
-            target,
-            i,
-            final_internal_format,
-            width,
-            height,
-            1,
-            border,
-            format,
-            type,
-            nullptr,
-            pixels_size,
-            0,
-            TextureManager::DoTexImageArguments::CommandType::kTexImage2D};
-        texture_manager()->WorkaroundCopyTexImageCubeMap(
-            &texture_state_, &state_, error_state_.get(), &framebuffer_state_,
-            texture_ref, func_name, args);
-      }
-    }
-
     if (requires_luma_blit) {
       copy_tex_image_blit_->DoCopyTexImage2DToLUMACompatibilityTexture(
           this, texture->service_id(), texture->target(), target, format, type,
           level, internal_format, x, y, width, height,
           GetBoundReadFramebufferServiceId(),
           GetBoundReadFramebufferInternalFormat());
     } else {
-      if (workarounds().init_one_cube_map_level_before_copyteximage &&
-          texture->target() == GL_TEXTURE_CUBE_MAP &&
-          target != GL_TEXTURE_CUBE_MAP_POSITIVE_X) {
-        TextureManager::DoTexImageArguments args = {
-            target,
-            level,
-            final_internal_format,
-            width,
-            height,
-            1,
-            border,
-            format,
-            type,
-            nullptr,
-            pixels_size,
-            0,
-            TextureManager::DoTexImageArguments::CommandType::kTexImage2D};
-        texture_manager()->WorkaroundCopyTexImageCubeMap(
-            &texture_state_, &state_, error_state_.get(), &framebuffer_state_,
-            texture_ref, func_name, args);
-      }
       if (workarounds().clear_pixel_unpack_buffer_before_copyteximage)
         state_.PushTextureUnpackState();
       api()->glCopyTexImage2DFn(target, level, final_internal_format, x, y,
diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json
@@ -969,7 +969,6 @@
       "vendor_id": "0x1002",
       "device_id": ["0x9440", "0x944a", "0x9488", "0x9490"],
       "features": [
-        "disable_overlay_ca_layers",
         "disable_post_sub_buffers_for_onscreen_surfaces"
       ]
     },
@@ -1162,23 +1161,6 @@
         "EGL_KHR_fence_sync"
       ]
     },
-    {
-      "id": 158,
-      "description": "IOSurface use becomes pathologically slow over time on 10.10.",
-      "cr_bugs": [580616],
-      "os": {
-        "type": "macosx",
-        "version": {
-          "op": "=",
-          "value": "10.10"
-        }
-      },
-      "vendor_id": "0x10de",
-      "device_id": ["0x0fd5"],
-      "features": [
-        "disable_overlay_ca_layers"
-      ]
-    },
     {
       "id": 159,
       "cr_bugs": [570897],
@@ -1410,18 +1392,6 @@
         "gl_clear_broken"
       ]
     },
-    {
-      "id": 183,
-      "description": "Result of abs(i) where i is an integer in vertex shader is wrong",
-      "cr_bugs": [642227],
-      "os": {
-        "type": "macosx"
-      },
-      "vendor_id": "0x8086",
-      "features": [
-        "emulate_abs_int_function"
-      ]
-    },
     {
       "id": 184,
       "description": "Rewrite texelFetchOffset to texelFetch for Intel Mac",
@@ -1477,22 +1447,6 @@
         "rewrite_do_while_loops"
       ]
     },
-    {
-      "id": 189,
-      "description": "Do TexImage2D first before CopyTexImage2D for cube map texture on Intel Mac 10.11",
-      "cr_bugs": [648197],
-      "os": {
-        "type": "macosx",
-        "version": {
-          "op": "<=",
-          "value": "10.11"
-        }
-      },
-      "vendor_id": "0x8086",
-      "features": [
-        "init_one_cube_map_level_before_copyteximage"
-      ]
-    },
     {
       "id": 190,
       "description": "Disable partial swaps on Mesa drivers (detected with GL_VERSION)",
@@ -1506,24 +1460,6 @@
         "disable_post_sub_buffers_for_onscreen_surfaces"
       ]
     },
-    {
-      "id": 191,
-      "description": "Emulate GLSL function isnan() on Intel Mac",
-      "cr_bugs": [650547],
-      "os": {
-        "type": "macosx",
-        "version": {
-          "op": "<",
-          "value": "10.13.2"
-        }
-      },
-      "intel_gpu_series" : [
-        "skylake"
-      ],
-      "features" : [
-        "emulate_isnan_on_float"
-      ]
-    },
     {
       "id": 192,
       "description": "Decode and encode before generateMipmap for srgb format textures on os except macosx",
@@ -1555,22 +1491,6 @@
         "decode_encode_srgb_for_generatemipmap"
       ]
     },
-    {
-      "id": 194,
-      "description": "Init first two levels before CopyTexImage2D for cube map texture on Intel Mac 10.12",
-      "cr_bugs": [648197],
-      "os": {
-        "type": "macosx",
-        "version": {
-          "op": ">=",
-          "value": "10.12"
-        }
-      },
-      "vendor_id": "0x8086",
-      "features": [
-        "init_two_cube_map_levels_before_copyteximage"
-      ]
-    },
     {
       "id": 195,
       "description": "Insert statements to reference all members in unused std140/shared blocks on Mac",
@@ -2416,19 +2336,6 @@
         "disable_direct_composition"
       ]
     },
-    {
-      "id": 279,
-      "description": "WindowServer crashes on VMWare bots using CA renderer",
-      "cr_bugs": [828031],
-      "os": {
-        "type": "macosx"
-      },
-      "vendor_id": "0x15ad",
-      "multi_gpu_category": "any",
-      "features": [
-        "disable_overlay_ca_layers"
-      ]
-    },
     {
       "id": 280,
       "description": "ReadPixels is broken with EXT_multisampled_render_to_texture on recent Adreno drivers.",
diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt
@@ -49,7 +49,6 @@ disable_metal
 disable_multisampling_color_mask_usage
 disable_nv12_dxgi_video
 disable_nv12_dynamic_textures
-disable_overlay_ca_layers
 disable_post_sub_buffers_for_onscreen_surfaces
 disable_program_cache
 disable_program_caching_for_transform_feedback
@@ -68,8 +67,6 @@ dont_delete_source_texture_for_egl_image
 dont_initialize_uninitialized_locals
 dont_use_eglclientwaitsync_with_timeout
 dont_use_loops_to_initialize_variables
-emulate_abs_int_function
-emulate_isnan_on_float
 enable_bgra8_overlays_with_yuv_overlay_support
 enable_webgl_timer_query_extensions
 etc1_power_of_two_only
@@ -90,9 +87,7 @@ force_rgb10a2_overlay_support
 force_update_scissor_state_when_binding_fbo0
 gl_clear_broken
 init_gl_position_in_vertex_shader
-init_one_cube_map_level_before_copyteximage
 init_texture_max_anisotropy
-init_two_cube_map_levels_before_copyteximage
 init_vertex_attributes
 limit_d3d11_video_decoder_to_11_0
 max_3d_array_texture_size_1024
