diff options
| author |  Brian Osman <brianosman@google.com> | 2017-05-22 20:14:41 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-22 20:14:50 +0000 |
| commit | bc262e110a7292950ce912e42de75b7573d0367e (patch) | |
| tree | 3a5777eb2ab87791b487e3141d00c91b9749adf4 /src/gpu/ops/GrCopySurfaceOp.cpp | |
| parent | bcd8637772e3a678c744e28b4f4b2d42f8405284 (diff) | |
Revert "Remove compressed (ETC1) texture support from Ganesh"
This reverts commit ee26363aaae62db2a851f2873e2405a9cf7f995a.
Reason for revert: Failing Google 3 roll.
Original change's description:
> Remove compressed (ETC1) texture support from Ganesh
>
> Change-Id: If4cf286df87ea87338aba47001d90a5fcc4f2667
> Reviewed-on: https://skia-review.googlesource.com/17456
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
>
TBR=bsalomon@google.com,robertphillips@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ie1a57187287e03600a69e374501478e93c41415c
Reviewed-on: https://skia-review.googlesource.com/17527
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/ops/GrCopySurfaceOp.cpp')
| -rw-r--r-- | src/gpu/ops/GrCopySurfaceOp.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gpu/ops/GrCopySurfaceOp.cpp b/src/gpu/ops/GrCopySurfaceOp.cpp index 9cbde0e53b..5feed18f76 100644 --- a/src/gpu/ops/GrCopySurfaceOp.cpp +++ b/src/gpu/ops/GrCopySurfaceOp.cpp @@ -67,6 +67,9 @@ std::unique_ptr<GrOp> GrCopySurfaceOp::Make(GrResourceProvider* resourceProvider if (GrPixelConfigIsSint(dstProxy->config()) != GrPixelConfigIsSint(srcProxy->config())) { return nullptr; } + if (GrPixelConfigIsCompressed(dstProxy->config())) { + return nullptr; + } SkIRect clippedSrcRect; SkIPoint clippedDstPoint; // If the rect is outside the srcProxy or dstProxy then we've already succeeded. |