diff options
| author |  halcanary <halcanary@google.com> | 2014-07-15 19:51:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-15 19:51:35 -0700 |
| commit | be7e59e3b441949749b014830f2686ee0ceb3a96 (patch) | |
| tree | 899b50d119e19cda3c4762ccc68a5b07bc422b1b /src | |
| parent | 21048b588faa6a1c84949603ba82d9d4ba2f0cdd (diff) | |
Make SkTextureCompressor compile with Clang 3.5
kR11EACModifierPalettes moved inside #ifdef where it is used
R=mtklein@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/391113002
Diffstat (limited to 'src')
| -rw-r--r-- | src/utils/SkTextureCompressor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/utils/SkTextureCompressor.cpp b/src/utils/SkTextureCompressor.cpp index 2b92347460..2b33a13469 100644 --- a/src/utils/SkTextureCompressor.cpp +++ b/src/utils/SkTextureCompressor.cpp @@ -312,6 +312,8 @@ static inline bool compress_a8_to_latc(uint8_t* dst, const uint8_t* src, // If mul is zero, then we set mul = 1/8, so that the formula becomes // clamp[0, 2047](base_cw * 8 + 4 + mod_val) +#if COMPRESS_R11_EAC_SLOW + static const int kNumR11EACPalettes = 16; static const int kR11EACPaletteSize = 8; static const int kR11EACModifierPalettes[kNumR11EACPalettes][kR11EACPaletteSize] = { @@ -333,7 +335,6 @@ static const int kR11EACModifierPalettes[kNumR11EACPalettes][kR11EACPaletteSize] {-3, -5, -7, -9, 2, 4, 6, 8} }; -#if COMPRESS_R11_EAC_SLOW // Pack the base codeword, palette, and multiplier into the 64 bits necessary // to decode it. static uint64_t pack_r11eac_block(uint16_t base_cw, uint16_t palette, uint16_t multiplier, |