aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/gpu/vk/GrVkSampler.cpp5
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);