commit 107524c2a26e81ebeb2edaa62a96df3bcde0d0c7
author Brian Salomon <bsalomon@google.com> Mon Mar 20 17:08:43 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Mar 21 13:06:15 2017 +0000
tree 732002fdece1a1b43f43995308ed27b8c5e705b9
parent bbb24f2ab83e4799ad392be3e49168425c6555b0

Attempt to fix AMD ANGLE bots.

Makes the second context used for image tests be of the same type as it was before https://skia.googlesource.com/skia/+/6405e71279e99731f89db69325c6763ec62a98e1

Change-Id: Id861214e5bea2b874ba5eae4489a982340c2f101
Reviewed-on: https://skia-review.googlesource.com/9912
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

tests/ImageTest.cpp

diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index b16426a..ab2215b 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -445,11 +445,11 @@
 GrContextFactory::ContextType pick_second_context_type(const sk_gpu_test::ContextInfo& info) {
     switch (info.backend()) {
         case kOpenGL_GrBackend:
-            if (info.glContext()->gl()->fStandard == kGLES_GrGLStandard) {
-                return GrContextFactory::kGLES_ContextType;
-            } else {
-                return GrContextFactory::kGL_ContextType;
-            }
+#if defined(SK_BUILD_FOR_WIN) || defined(SK_BUILD_FOR_UNIX) || defined (SK_BUILD_FOR_MAC)
+            return GrContextFactory::kGL_ContextType;
+#else
+            return GrContextFactory::kGLES_ContextType;
+#endif
         case kVulkan_GrBackend:
             return GrContextFactory::kVulkan_ContextType;
     }
@@ -928,7 +928,7 @@
             testContext->makeCurrent();
             return otherContextImage;
           }, {{SkMatrix::I(), kNone_SkFilterQuality, 0}},
-        kNone_SkFilterQuality, 1, false },
+          kNone_SkFilterQuality, 1, false },
         // Create an image that is too large to upload.
         { createLarge, {{SkMatrix::I(), kNone_SkFilterQuality, 0}},
           kNone_SkFilterQuality, 1, false },