aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-06-08 13:03:37 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-06-08 13:03:50 +0000
commitd7c681d6a7b154d276e275becc51685eac8705c2 (patch)
treef7deeb36aab0dabffb6438939726902ba45a8c77 /include
parentcde9031a5a347a762a3946d216f96542d9cfcef4 (diff)
Revert "DeferredTextureImageData low-bit-depth/dithering support"
This reverts commit 2c075e749d1f33dea06ad2710e15c9a1d60ebced. Reason for revert: Breaking tests. e.g.: https://chromium-swarm.appspot.com/task?id=369dc44f62ce9510&refresh=10 Original change's description: > DeferredTextureImageData low-bit-depth/dithering support > > Cause DeferredTextureImageData functionality to support low bit depth > (4444, 565) image formats (with dithering). > > Bug: 720105 > Change-Id: Ie3b5768ebc393d9b0a5322461c722bf37c80b791 > Reviewed-on: https://skia-review.googlesource.com/18945 > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Eric Karl <ericrk@chromium.org> TBR=bsalomon@google.com,ericrk@chromium.org No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 720105 Change-Id: I07aec722425efc62bc54f82cee9a19a9bf339f7b Reviewed-on: https://skia-review.googlesource.com/19039 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'include')
-rw-r--r--include/core/SkImage.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index b896856b68..bc0597c300 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -447,15 +447,11 @@ public:
/** Drawing params for which a deferred texture image data should be optimized. */
struct DeferredTextureImageUsageParams {
DeferredTextureImageUsageParams(const SkMatrix matrix, const SkFilterQuality quality,
- int preScaleMipLevel,
- SkColorType colorType = kN32_SkColorType)
- : fMatrix(matrix), fQuality(quality), fPreScaleMipLevel(preScaleMipLevel),
- fColorType(colorType) {}
+ int preScaleMipLevel)
+ : fMatrix(matrix), fQuality(quality), fPreScaleMipLevel(preScaleMipLevel) {}
SkMatrix fMatrix;
SkFilterQuality fQuality;
int fPreScaleMipLevel;
- SkColorType fColorType;
-
};
/**