diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-09-21 13:35:12 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-21 17:58:53 +0000 |
| commit | f4b9bf7d9e688f1afedcf4a960a31582ddb56f4a (patch) | |
| tree | 86a148ea4c4e8a2bf5ac3ec57429f10dbccde5b2 | |
| parent | 3528eb319019b415c840349d2b35739bc2b38833 (diff) | |
Fix wrap mode asserts in GrVkSampler::GenerateKey
Samplers now use their own enum rather than SkShader::TileMode.
Change-Id: I25324f7905a3c22fcd3699d6a0f778befa8c32da
Reviewed-on: https://skia-review.googlesource.com/49764
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
| -rw-r--r-- | src/gpu/vk/GrVkSampler.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gpu/vk/GrVkSampler.cpp b/src/gpu/vk/GrVkSampler.cpp index 822817bed6..d0ffcc1edc 100644 --- a/src/gpu/vk/GrVkSampler.cpp +++ b/src/gpu/vk/GrVkSampler.cpp @@ -82,12 +82,13 @@ uint16_t GrVkSampler::GenerateKey(const GrSamplerState& samplerState, uint32_t m const int kTileModeYShift = 4; const int kMipLevelShift = 6; + SkASSERT(static_cast<int>(samplerState.filter()) <= 3); uint16_t key = static_cast<uint16_t>(samplerState.filter()); - SkASSERT(static_cast<int>(samplerState.filter()) <= 3); + SkASSERT(static_cast<int>(samplerState.wrapModeX()) <= 4); key |= (static_cast<uint16_t>(samplerState.wrapModeX()) << kTileModeXShift); - GR_STATIC_ASSERT(SkShader::kTileModeCount <= 4); + SkASSERT(static_cast<int>(samplerState.wrapModeY()) <= 4); key |= (static_cast<uint16_t>(samplerState.wrapModeY()) << kTileModeYShift); SkASSERT(maxMipLevel < 1024); |