Allow use/generation of MIP maps with YUVA images and strict subsets.
Strict subsetting is odd to mix with MIP maps, but we allow it for
all other images. At least be consistent. Long term we should remove
this feature and require users to make a subset image with it's own
MIP levels if they want to strictness + MIPs.
Bug: skia:10481
Change-Id: Ia12b60ef8d65a10bdf32f713daf77c366949ac26
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/374598
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/GrImageTextureMaker.cpp b/src/gpu/GrImageTextureMaker.cpp
index 6c2e57a..9be3a99 100644
--- a/src/gpu/GrImageTextureMaker.cpp
+++ b/src/gpu/GrImageTextureMaker.cpp
@@ -63,10 +63,10 @@
samplerState);
}
- // Check to see if the client has given us pre-mipped textures or we can generate them
- // If not disable mip mapping. Also disable when a subset is requested.
+ // Check to see if the client has given us pre-mipped textures or if we can generate them
+ // If not disable mip mapping.
if (samplerState.mipmapped() == GrMipmapped::kYes &&
- (subset || !fImage->setupMipmapsForPlanes(this->context()))) {
+ !fImage->setupMipmapsForPlanes(this->context())) {
samplerState.setMipmapMode(GrSamplerState::MipmapMode::kNone);
}
diff --git a/src/gpu/effects/GrYUVtoRGBEffect.cpp b/src/gpu/effects/GrYUVtoRGBEffect.cpp
index 025d06b..f250c37 100644
--- a/src/gpu/effects/GrYUVtoRGBEffect.cpp
+++ b/src/gpu/effects/GrYUVtoRGBEffect.cpp
@@ -115,7 +115,6 @@
}
}
if (subset) {
- SkASSERT(samplerState.mipmapped() == GrMipmapped::kNo);
if (makeLinearWithSnap) {
// The plane is subsampled and we have an overall subset on the image. We're
// emulating do_fancy_upsampling using linear filtering but snapping look ups to the
