From f4b9bf7d9e688f1afedcf4a960a31582ddb56f4a Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Thu, 21 Sep 2017 13:35:12 -0400 Subject: 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 Reviewed-by: Robert Phillips --- src/gpu/vk/GrVkSampler.cpp | 5 +++-- 1 file 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(samplerState.filter()) <= 3); uint16_t key = static_cast(samplerState.filter()); - SkASSERT(static_cast(samplerState.filter()) <= 3); + SkASSERT(static_cast(samplerState.wrapModeX()) <= 4); key |= (static_cast(samplerState.wrapModeX()) << kTileModeXShift); - GR_STATIC_ASSERT(SkShader::kTileModeCount <= 4); + SkASSERT(static_cast(samplerState.wrapModeY()) <= 4); key |= (static_cast(samplerState.wrapModeY()) << kTileModeYShift); SkASSERT(maxMipLevel < 1024); -- cgit v1.2.3