Revert "Switch bots to use ViaDDL (i.e., ddl-gl) instead of old --ddl flag"

This reverts commit d234c9e6b9a1a1b65009e7bbc4e076d1f11c3acc.

Reason for revert: GM/TSAN unhappiness

Original change's description:
> Switch bots to use ViaDDL (i.e., ddl-gl) instead of old --ddl flag
> 
> Change-Id: I9c5f27bacf7d9fa7a9ac123379e2556913810cba
> Reviewed-on: https://skia-review.googlesource.com/116464
> Reviewed-by: Eric Boren <borenet@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>

TBR=borenet@google.com,robertphillips@google.com

Change-Id: I95388ee582bdd9561b8ebf24250f58b361657b7c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/116621
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

1 files changed, 6 insertions, 20 deletions

diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 8458320e2b..4375da6e4f 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -239,13 +239,11 @@ def dm_flags(api, bot):
 
     # DDL is a GPU-only feature
     if 'DDL1' in bot:
-      # Just run gl for now but render the large skps
-      configs = ['gl']
-      args.extend(['--skpViewportSize', "2048"])
+      configs = [c for c in configs if c == 'gl' or c == 'gles']
+      args.extend(['--ddl', "1"])
     if 'DDL3' in bot:
-      # Just run ddl-gl for now but render the large skps
-      configs = ['ddl-gl']
-      args.extend(['--skpViewportSize', "2048"])
+      configs = [c for c in configs if c == 'gl' or c == 'gles']
+      args.extend(['--ddl', "3"])
 
   tf = api.vars.builder_cfg.get('test_filter')
   if 'All' != tf:
@@ -280,21 +278,14 @@ def dm_flags(api, bot):
     args.remove('image')
     args.remove('colorImage')
 
-  if 'DDL1' in bot:
-    # The DDL1 bot just renders large skp images as a baseline for full DDL
+  # For now it only renders the skps (i.e., no tests, no gms)
+  if 'DDL1' in bot or 'DDL3' in bot:
     args.remove('tests')
     args.remove('gm')
     args.remove('image')
     args.remove('colorImage')
     args.remove('svg')
-  elif 'DDL3' in bot:
-    # The DDL3 bot renders large skps and gms in full DDL mode
-    args.remove('tests')
-    args.remove('image')
-    args.remove('colorImage')
-    args.remove('svg')
   else:
-    # Currently, only the DDL bots render skps
     args.remove('skp')
 
   # TODO: ???
@@ -559,11 +550,6 @@ def dm_flags(api, bot):
     match.append('~WritePixels')  # skia:4711
     match.append('~PremulAlphaRoundTrip_Gpu')  # skia:7501
 
-  if 'DDL3' in bot:
-    match.append('~shadermaskfilter_image') # skia:7751
-    match.append('~imagefilterscropped')    # skia:7751
-    match.append('~animated-image-blurs')   # skia:7751
-
   if 'Chromecast' in bot:
     if 'GPU' in bot:
       # skia:6687