Enable GLES on Intel Linux bots.

BUG=skia:6401
NOTRY=true

Change-Id: Ief434ca38ffd504198e8d3656a0a869d0faa9ebf
Reviewed-on: https://skia-review.googlesource.com/9822
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

5 files changed, 39 insertions, 3 deletions

diff --git a/infra/bots/recipe_modules/perf/api.py b/infra/bots/recipe_modules/perf/api.py
index 8fdeca70db..1b6e63464f 100644
--- a/infra/bots/recipe_modules/perf/api.py
+++ b/infra/bots/recipe_modules/perf/api.py
@@ -53,6 +53,11 @@ def nanobench_flags(bot):
       gl_prefix + 'nvpr' + sample_count,
       gl_prefix + 'nvprdit' + sample_count])
 
+  # We want to test both the OpenGL config and the GLES config on Linux Intel:
+  # GL is used by Chrome, GLES is used by ChromeOS.
+  if 'Intel' in bot and 'Ubuntu' in bot:
+    config.extend(['gles', 'glesmsaa4'])
+
   # Bench instanced rendering on a limited number of platforms
   inst_config = gl_prefix + 'inst'
   if 'Nexus6' in bot:
@@ -100,6 +105,8 @@ def nanobench_flags(bot):
     match.append('~GLInstancedArraysBench') # skia:4714
   if 'IntelIris540' in bot and 'ANGLE' in bot:
     match.append('~tile_image_filter_tiled_64')  # skia:6082
+  if 'Intel' in bot and 'Ubuntu' in bot and not 'Vulkan' in bot:
+    match.append('~native_image_to_raster_surface')  # skia:6401
   if 'Vulkan' in bot and 'NexusPlayer' in bot:
     match.append('~hardstop') # skia:6037
 
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
index 445f265ced..3c65b21beb 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
@@ -136,7 +136,10 @@
       "glmsaa8",
       "glnvpr8",
       "glnvprdit8",
+      "gles",
+      "glesmsaa4",
       "--match",
+      "~native_image_to_raster_surface",
       "~inc0.gif",
       "~inc1.gif",
       "~incInterlaced.gif",
diff --git a/infra/bots/recipe_modules/sktest/api.py b/infra/bots/recipe_modules/sktest/api.py
index 84ba76d10e..8a2eee7e31 100644
--- a/infra/bots/recipe_modules/sktest/api.py
+++ b/infra/bots/recipe_modules/sktest/api.py
@@ -73,6 +73,11 @@ def dm_flags(bot):
         'GT610'    in bot):
       configs.append(gl_prefix + 'nvprdit' + sample_count)
 
+  # We want to test both the OpenGL config and the GLES config on Linux Intel:
+  # GL is used by Chrome, GLES is used by ChromeOS.
+  if 'Intel' in bot and 'Ubuntu' in bot:
+    configs.extend(['gles', 'glesdft', 'glessrgb', 'glesmsaa4'])
+
   # NP is running out of RAM when we run all these modes.  skia:3255
   if 'NexusPlayer' not in bot:
     configs.extend(mode + '-8888' for mode in
@@ -124,7 +129,8 @@ def dm_flags(bot):
 
   # TODO: ???
   blacklist('f16 _ _ dstreadshuffle')
-  blacklist(gl_prefix + 'srgb image _ _')
+  blacklist('glsrgb image _ _')
+  blacklist('glessrgb image _ _')
 
   # Decoder tests are now performing gamma correct decodes.  This means
   # that, when viewing the results, we need to perform a gamma correct
@@ -313,8 +319,8 @@ def dm_flags(bot):
 
   if 'IntelHD405' in bot and 'Ubuntu16' in bot:
     # skia:6331
-    blacklist(gl_prefix + 'msaa' + sample_count +
-        ' image gen_codec_gpu abnormal.wbmp')
+    blacklist(['glmsaa8',   'image', 'gen_codec_gpu', 'abnormal.wbmp'])
+    blacklist(['glesmsaa4', 'image', 'gen_codec_gpu', 'abnormal.wbmp'])
 
   if 'Nexus5' in bot:
     # skia:5876
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
index b53a3d7e06..65b621c0a6 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
@@ -230,6 +230,10 @@
       "gl",
       "gldft",
       "glsrgb",
+      "gles",
+      "glesdft",
+      "glessrgb",
+      "glesmsaa4",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
@@ -244,6 +248,10 @@
       "image",
       "_",
       "_",
+      "glessrgb",
+      "image",
+      "_",
+      "_",
       "8888",
       "image",
       "_",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json
index 9093be13c3..b5b1d2d91c 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json
@@ -231,6 +231,10 @@
       "gldft",
       "glsrgb",
       "glmsaa8",
+      "gles",
+      "glesdft",
+      "glessrgb",
+      "glesmsaa4",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
@@ -245,6 +249,10 @@
       "image",
       "_",
       "_",
+      "glessrgb",
+      "image",
+      "_",
+      "_",
       "8888",
       "image",
       "_",
@@ -532,6 +540,10 @@
       "glmsaa8",
       "image",
       "gen_codec_gpu",
+      "abnormal.wbmp",
+      "glesmsaa4",
+      "image",
+      "gen_codec_gpu",
       "abnormal.wbmp"
     ],
     "cwd": "[START_DIR]/skia",