aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/image
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2017-03-15 13:02:45 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-03-15 18:34:32 +0000
commita4c41b3e83bc684b3535d36590519d6fb676742d (patch)
tree47384e6b64cf3ddec64b98fe973a2c287d9cc7a1 /src/image
parent2229d443d19ea8a733e5eaf314e06dafb073536f (diff)
Push setMipColorMode calls further down-stack & add to GrTextureProxy
setMipColorMode seems like an odd call. Change-Id: I24a1ac3883d52499f3be27282d006144d15b26f1 Reviewed-on: https://skia-review.googlesource.com/9725 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/image')
-rw-r--r--src/image/SkImage_Gpu.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index cb92942954..44d793842e 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -838,11 +838,10 @@ sk_sp<SkImage> SkImage::MakeTextureFromMipMap(GrContext* ctx, const SkImageInfo&
if (!ctx) {
return nullptr;
}
- sk_sp<GrTexture> texture(GrUploadMipMapToTexture(ctx, info, texels, mipLevelCount));
+ sk_sp<GrTexture> texture(GrUploadMipMapToTexture(ctx, info, texels, mipLevelCount, colorMode));
if (!texture) {
return nullptr;
}
- texture->texturePriv().setMipColorMode(colorMode);
return sk_make_sp<SkImage_Gpu>(kNeedNewImageUniqueID,
info.alphaType(), std::move(texture),
sk_ref_sp(info.colorSpace()), budgeted);