Remove dynamic indexing for swizzled vectors

A workaround for vector-dynamic-indexing-swizzled-lvalue.html.

Bug: 709351
Change-Id: I544583b26055a8ff2d62e81fcf06bbde769aa886
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1877817
Commit-Queue: Jie A Chen <jie.a.chen@intel.com>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709381}

content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt

@@ -116,10 +116,6 @@ crbug.com/963450 [ opengl win passthrough intel ] deqp/functional/gles3/textures
 crbug.com/795030 [ opengl win passthrough intel ] deqp/functional/gles3/shadercommonfunction.html [ Failure ]
 crbug.com/angleproject/2994 [ opengl win passthrough intel ] conformance2/textures/misc/copy-texture-image-same-texture.html [ Failure ]
 
-# Intel driver issues
-crbug.com/602688 [ opengl win passthrough intel ] conformance2/glsl3/vector-dynamic-indexing-swizzled-lvalue.html [ Failure ]
-crbug.com/602688 [ opengl win passthrough intel ] conformance2/glsl3/vector-dynamic-indexing.html [ Failure ]
-
 # Passthrough command decoder / Windows / OpenGL / Intel
 # This case causes no-over-optimization-on-uniform-array fail.
 crbug.com/884210 [ opengl win passthrough intel ] conformance/ogles/GL/gl_FragCoord/gl_FragCoord_001_to_003.html [ Skip ]
@@ -298,7 +294,6 @@ crbug.com/905003 [ sierra intel-0xa2e ] conformance2/textures/misc/integer-cubem
 
 # Fails on multiple GPU types.
 crbug.com/844311 [ mac ] conformance/glsl/misc/fragcolor-fragdata-invariant.html [ Failure ]
-crbug.com/709351 [ mac ] conformance2/glsl3/vector-dynamic-indexing-swizzled-lvalue.html [ Failure ]
 crbug.com/630800 [ intel mac ] conformance2/rendering/framebuffer-completeness-unaffected.html [ Failure ]
 crbug.com/630800 [ nvidia mac ] conformance2/rendering/framebuffer-completeness-unaffected.html [ Failure ]
 crbug.com/965209 [ mac ] conformance2/textures/canvas/tex-2d-rgb16f-rgb-half_float.html [ RetryOnFailure ]
@@ -699,8 +694,6 @@ crbug.com/809237 [ linux amd-0x6613 ] conformance2/uniforms/incompatible-texture
 [ android qualcomm ] WebglExtension_WEBGL_compressed_texture_s3tc [ Skip ]
 [ android qualcomm ] WebglExtension_WEBGL_compressed_texture_s3tc_srgb [ Skip ]
 
-# Basic failures that need to be investigated on multiple devices
-crbug.com/709351 [ android ] conformance2/glsl3/vector-dynamic-indexing-swizzled-lvalue.html [ Failure ]
 
 # Video tests are flaky. Sometimes the video is black.
 crbug.com/948894 [ android ] conformance/textures/video/* [ RetryOnFailure ]

gpu/command_buffer/service/gles2_cmd_decoder.cc

@@ -4489,6 +4489,8 @@ bool GLES2DecoderImpl::InitializeShaderTranslator() {
     driver_bug_workarounds |= SH_REWRITE_FLOAT_UNARY_MINUS_OPERATOR;
   if (workarounds().dont_use_loops_to_initialize_variables)
     driver_bug_workarounds |= SH_DONT_USE_LOOPS_TO_INITIALIZE_VARIABLES;
+  if (workarounds().remove_dynamic_indexing_of_swizzled_vector)
+    driver_bug_workarounds |= SH_REMOVE_DYNAMIC_INDEXING_OF_SWIZZLED_VECTOR;
 
   // Initialize uninitialized locals by default
   if (!workarounds().dont_initialize_uninitialized_locals)

gpu/config/gpu_driver_bug_list.json

@@ -3390,6 +3390,28 @@
       "features": [
         "disable_direct_composition"
       ]
+    },
+    {
+      "id": 319,
+      "cr_bugs": [709351],
+      "description": "Remove dynamic indexing for swizzled vectors on Mac",
+      "os": {
+        "type": "macosx"
+      },
+      "features": [
+        "remove_dynamic_indexing_of_swizzled_vector"
+      ]
+    },
+    {
+      "id": 320,
+      "cr_bugs": [709351],
+      "description": "Remove dynamic indexing for swizzled vectors on Android",
+      "os": {
+        "type": "android"
+      },
+      "features": [
+        "remove_dynamic_indexing_of_swizzled_vector"
+      ]
     }
   ]
 }

gpu/config/gpu_workaround_list.txt

@@ -116,3 +116,4 @@ use_eqaa_storage_samples_2
 max_3d_array_texture_size_1024
 disable_half_float_for_gmb
 prefer_draw_to_copy
+remove_dynamic_indexing_of_swizzled_vector