aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Greg Daniel <egdaniel@google.com>2018-06-13 13:09:18 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-13 17:32:26 +0000
commite141548696bd049b0e520391ff64e64e4e02c55f (patch)
tree50e7ab0ceb39b28fa3f75e71467c208a4a67faf6
parent1e447dfb7702460fc3dea5634c1e69d274b1b739 (diff)
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>
-rw-r--r--tests/ImageTest.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index dc7576acad..2edf8b5706 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -427,7 +427,8 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkImage_makeTextureImage, reporter, contextIn
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;
}