[GPU][Mac] Remove no-longer-needed workaround
This CL removes an OS X-specific GPU workaround that is used only in the
validating command decoder, which is no longer used on Mac.
Change-Id: Ic4d2d4951c412e1c270e95af3546bb3e0e554525
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4694489
Reviewed-by: Vasiliy Telezhnikov <vasilyt@chromium.org>
Commit-Queue: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1172400}
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 18c38b9..649a6e3 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -14429,14 +14429,9 @@
// vs. "actual" internal format, so this will have to do for now. See
// Table 3.12 and associated explanatory text in the OpenGL ES 3.0.6
// spec for more information.
- //
- // Unfortunately, changing the internal format here conflicts with a
- // macos workaround flag, so don't do it if the workaround applies.
bool attempt_sized_upgrade =
- (!workarounds().use_intermediary_for_copy_texture_image ||
- target == GL_TEXTURE_2D) &&
- (read_format == GL_RGB || read_format == GL_RGB8 ||
- read_format == GL_RGBA || read_format == GL_RGBA8);
+ read_format == GL_RGB || read_format == GL_RGB8 ||
+ read_format == GL_RGBA || read_format == GL_RGBA8;
switch (internal_format) {
case GL_RGB:
if (attempt_sized_upgrade) {
diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json
index bd99f7e..f74f5d3 100644
--- a/gpu/config/gpu_driver_bug_list.json
+++ b/gpu/config/gpu_driver_bug_list.json
@@ -1164,17 +1164,6 @@
]
},
{
- "id": 152,
- "cr_bugs": [581777],
- "description": "copyTexImage2D fails when reading from IOSurface on multiple GPU types.",
- "os": {
- "type": "macosx"
- },
- "features": [
- "use_intermediary_for_copy_texture_image"
- ]
- },
- {
"id": 153,
"cr_bugs": [594016],
"description": "Vivante GC1000 with EXT_multisampled_render_to_texture fails glReadPixels",
diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt
index 3a39e36..cecf6a82 100644
--- a/gpu/config/gpu_workaround_list.txt
+++ b/gpu/config/gpu_workaround_list.txt
@@ -140,7 +140,6 @@
use_empty_video_hdr_metadata
use_eqaa_storage_samples_2
use_gpu_driver_workaround_for_testing
-use_intermediary_for_copy_texture_image
use_non_zero_size_for_client_side_stream_buffers
use_unused_standard_shared_blocks
use_virtualized_gl_contexts
