commit e141548696bd049b0e520391ff64e64e4e02c55f
author Greg Daniel <egdaniel@google.com> Wed Jun 13 13:09:18 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jun 13 17:32:26 2018 +0000
tree 50e7ab0ceb39b28fa3f75e71467c208a4a67faf6
parent 1e447dfb7702460fc3dea5634c1e69d274b1b739

Fix ImageTest to check if gpu mip maps are supported.

Bug: skia:
Change-Id: Iccef46cb61926f8cfdf29c8a095566d4b4ecda61
Reviewed-on: https://skia-review.googlesource.com/134516
Auto-Submit: Greg Daniel <egdaniel@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

tests/ImageTest.cpp

diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index dc7576a..2edf8b5 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -427,7 +427,8 @@
                     continue;
                 }
                 if (GrMipMapped::kYes == mipMapped &&
-                    as_IB(texImage)->peekProxy()->mipMapped() != mipMapped) {
+                    as_IB(texImage)->peekProxy()->mipMapped() != mipMapped &&
+                    context->contextPriv().caps()->mipMapSupport()) {
                     ERRORF(reporter, "makeTextureImage returned non-mipmapped texture.");
                     continue;
                 }