commit 78325c1d01fb8b6c3d9e2aadc647140c8abb8976
author Greg Daniel <egdaniel@google.com> Mon Jun 19 16:39:13 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jun 19 21:03:34 2017 +0000
tree 477eb309b414e6d377158da3b4f59e9eb0fb416d
parent 74c3680eba9474908f713359f8d044643ca3cde6

Restrict max levels for D3D Angle on GLPrograms test as well

BUG=skia:4717

Change-Id: I6111af2526042296c510318520c96c0ce5efc214
Reviewed-on: https://skia-review.googlesource.com/20284
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

tests/GLProgramsTest.cpp

diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 66d6cee..cfa5561 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -211,17 +211,11 @@
 
 static void set_random_color_coverage_stages(GrPaint* paint,
                                              GrProcessorTestData* d,
-                                             int maxStages) {
+                                             int maxStages,
+                                             int maxTreeLevels) {
     // Randomly choose to either create a linear pipeline of procs or create one proc tree
     const float procTreeProbability = 0.5f;
     if (d->fRandom->nextF() < procTreeProbability) {
-        // A full tree with 5 levels (31 nodes) may cause a program that exceeds shader limits
-        // (e.g. uniform or varying limits); maxTreeLevels should be a number from 1 to 4 inclusive.
-        int maxTreeLevels = 4;
-        // On iOS we can exceed the maximum number of varyings. http://skbug.com/6627.
-#ifdef SK_BUILD_FOR_IOS
-        maxTreeLevels = 2;
-#endif
         sk_sp<GrFragmentProcessor> fp(create_random_proc_tree(d, 2, maxTreeLevels));
         paint->addColorFragmentProcessor(std::move(fp));
     } else {
@@ -257,7 +251,7 @@
 #if !GR_TEST_UTILS
 bool GrDrawingManager::ProgramUnitTest(GrContext*, int) { return true; }
 #else
-bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) {
+bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages, int maxLevels) {
     GrDrawingManager* drawingManager = context->contextPriv().drawingManager();
 
     sk_sp<GrTextureProxy> proxies[2];
@@ -300,7 +294,7 @@
 
         GrPaint paint;
         GrProcessorTestData ptd(&random, context, renderTargetContext.get(), proxies);
-        set_random_color_coverage_stages(&paint, &ptd, maxStages);
+        set_random_color_coverage_stages(&paint, &ptd, maxStages, maxLevels);
         set_random_xpf(&paint, &ptd);
         set_random_state(&paint, &random);
         GrDrawRandomOp(&random, renderTargetContext.get(), std::move(paint));
@@ -368,12 +362,33 @@
     return maxStages;
 }
 
+static int get_glprograms_max_levels(const sk_gpu_test::ContextInfo& ctxInfo) {
+    // A full tree with 5 levels (31 nodes) may cause a program that exceeds shader limits
+    // (e.g. uniform or varying limits); maxTreeLevels should be a number from 1 to 4 inclusive.
+    int maxTreeLevels = 4;
+    // On iOS we can exceed the maximum number of varyings. http://skbug.com/6627.
+#ifdef SK_BUILD_FOR_IOS
+    maxTreeLevels = 2;
+#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.
+        maxTreeLevels = 2;
+    }
+    return maxTreeLevels;
+}
+
 static void test_glprograms(skiatest::Reporter* reporter, const sk_gpu_test::ContextInfo& ctxInfo) {
     int maxStages = get_glprograms_max_stages(ctxInfo);
     if (maxStages == 0) {
         return;
     }
-    REPORTER_ASSERT(reporter, GrDrawingManager::ProgramUnitTest(ctxInfo.grContext(), maxStages));
+    int maxLevels = get_glprograms_max_levels(ctxInfo);
+    if (maxLevels == 0) {
+        return;
+    }
+    REPORTER_ASSERT(reporter, GrDrawingManager::ProgramUnitTest(ctxInfo.grContext(), maxStages,
+                                                                maxLevels));
 }
 
 DEF_GPUTEST(GLPrograms, reporter, /*factory*/) {