diff options
| author |  krajcevski <krajcevski@google.com> | 2014-08-07 11:33:59 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-07 11:33:59 -0700 |
| commit | 7b624480654222a72e05deb1b3cc7d1849ce043d (patch) | |
| tree | ef238afcbb74ea687eb4d0d391672876314d3826 /src/utils/SkTextureCompressor_ASTC.cpp | |
| parent | 9f2ed6d4d85464bda359d04e646629d96b757362 (diff) | |
Revert of - Add astcbitmap to gm slides (https://codereview.chromium.org/444093002/)
Reason for revert:
Breaking DM
Original issue's description:
> - Add astcbitmap to gm slides
> - Add additional ASTC formats
> - Add astc image decoder files
>
> Committed: https://skia.googlesource.com/skia/+/2fc05823fed4b9649338f3029cd1ba05ef49a02f
R=reed@google.com, robertphillips@google.com, halcanary@google.com
TBR=halcanary@google.com, reed@google.com, robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
Author: krajcevski@google.com
Review URL: https://codereview.chromium.org/447343002
Diffstat (limited to 'src/utils/SkTextureCompressor_ASTC.cpp')
| -rw-r--r-- | src/utils/SkTextureCompressor_ASTC.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/utils/SkTextureCompressor_ASTC.cpp b/src/utils/SkTextureCompressor_ASTC.cpp index 13fec8f56d..25d87fd28e 100644 --- a/src/utils/SkTextureCompressor_ASTC.cpp +++ b/src/utils/SkTextureCompressor_ASTC.cpp @@ -1708,8 +1708,7 @@ struct ASTCDecompressionData { // The rest of the CEM config will be between the dual plane bit selector // and the texel weight grid. const int lowCEM = static_cast<int>(read_astc_bits(fBlock, 23, 29)); - SkASSERT(lastWeight >= dualPlaneBitLoc); - SkASSERT(lastWeight - dualPlaneBitLoc < 31); + SkASSERT(lastWeight - dualPlaneBitLoc > 31); int fullCEM = static_cast<int>(read_astc_bits(fBlock, dualPlaneBitLoc, lastWeight)); // Attach the config at the end of the weight grid to the CEM values |