Limit number of stages for Angle D3D for GLPrograms test

Bug: skia:4717
Change-Id: I5ea613311d2c346bc45875040665a121b455f674
Reviewed-on: https://skia-review.googlesource.com/20228
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

4 files changed, 9 insertions, 15 deletions

diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json
index ebf37b7c19..3a64a0cea4 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json
@@ -417,10 +417,6 @@
       "image",
       "_",
       ".SRW",
-      "angle_d3d9_es2",
-      "test",
-      "_",
-      "GLPrograms",
       "_",
       "gm",
       "_",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json
index 8c0122f328..399bdc7be0 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json
@@ -417,11 +417,7 @@
       "_",
       "image",
       "_",
-      ".SRW",
-      "angle_d3d9_es2",
-      "test",
-      "_",
-      "GLPrograms"
+      ".SRW"
     ],
     "env": {
       "BUILDTYPE": "Debug_x64",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 049eb26af4..75db389f25 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -414,10 +414,6 @@ def dm_flags(bot):
   if 'GalaxyS7_G930A' in bot:
     match.append('~WritePixels') # skia:6427
 
-  if 'ANGLE' in bot:
-    # skia:4717, skia:6772
-    blacklist(['angle_d3d9_es2', 'test', '_', 'GLPrograms'])
-
   if 'MSAN' in bot:
     match.extend(['~Once', '~Shared'])  # Not sure what's up with these tests.
 
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index cc61891dd4..66d6ceecec 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -342,7 +342,8 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) {
 }
 #endif
 
-static int get_glprograms_max_stages(GrContext* context) {
+static int get_glprograms_max_stages(const sk_gpu_test::ContextInfo& ctxInfo) {
+    GrContext* context = ctxInfo.grContext();
     GrGLGpu* gpu = static_cast<GrGLGpu*>(context->getGpu());
     int maxStages = 6;
     if (kGLES_GrGLStandard == gpu->glStandard()) {
@@ -359,11 +360,16 @@ static int get_glprograms_max_stages(GrContext* context) {
         maxStages = 3;
 #endif
     }
+    if (ctxInfo.type() == sk_gpu_test::GrContextFactory::kANGLE_D3D9_ES2_ContextType ||
+        ctxInfo.type() == sk_gpu_test::GrContextFactory::kANGLE_D3D11_ES2_ContextType) {
+        // On Angle D3D we will hit a limit of out variables if we use too many stages.
+        maxStages = 3;
+    }
     return maxStages;
 }
 
 static void test_glprograms(skiatest::Reporter* reporter, const sk_gpu_test::ContextInfo& ctxInfo) {
-    int maxStages = get_glprograms_max_stages(ctxInfo.grContext());
+    int maxStages = get_glprograms_max_stages(ctxInfo);
     if (maxStages == 0) {
         return;
     }