diff options
| author |  bsalomon <bsalomon@google.com> | 2016-04-29 12:03:52 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-29 12:03:52 -0700 |
| commit | 5ee89a6faf3be9fb6d00ecc6cec190e27f55f507 (patch) | |
| tree | ca4a2f7fef4dda65b47d6aa78eaa956a0d836684 /src | |
| parent | 817fed3cb7d88e2b40b4c7cf887f34911aa79495 (diff) | |
Unbreak vulkan after stencil constant name changes
TBR=egdaniel@google.com,jvanverth@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1930323003
NOTREECHECKS=true
Review-Url: https://codereview.chromium.org/1930323003
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/vk/GrVkPipeline.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/vk/GrVkPipeline.cpp b/src/gpu/vk/GrVkPipeline.cpp index 53e9dba08f..2a9c6e2dd4 100644 --- a/src/gpu/vk/GrVkPipeline.cpp +++ b/src/gpu/vk/GrVkPipeline.cpp @@ -109,7 +109,7 @@ VkStencilOp stencil_op_to_vk_stencil_op(GrStencilOp op) { VK_STENCIL_OP_ZERO, // kZero_StencilOp VK_STENCIL_OP_INVERT, // kInvert_StencilOp }; - GR_STATIC_ASSERT(SK_ARRAY_COUNT(gTable) == kStencilOpCount); + GR_STATIC_ASSERT(SK_ARRAY_COUNT(gTable) == kStencilOpCnt); GR_STATIC_ASSERT(0 == kKeep_StencilOp); GR_STATIC_ASSERT(1 == kReplace_StencilOp); GR_STATIC_ASSERT(2 == kIncWrap_StencilOp); @@ -118,7 +118,7 @@ VkStencilOp stencil_op_to_vk_stencil_op(GrStencilOp op) { GR_STATIC_ASSERT(5 == kDecClamp_StencilOp); GR_STATIC_ASSERT(6 == kZero_StencilOp); GR_STATIC_ASSERT(7 == kInvert_StencilOp); - SkASSERT((unsigned)op < kStencilOpCount); + SkASSERT((unsigned)op < kStencilOpCnt); return gTable[op]; } @@ -133,7 +133,7 @@ VkCompareOp stencil_func_to_vk_compare_op(GrStencilFunc basicFunc) { VK_COMPARE_OP_EQUAL, // kEqual_StencilFunc, VK_COMPARE_OP_NOT_EQUAL, // kNotEqual_StencilFunc, }; - GR_STATIC_ASSERT(SK_ARRAY_COUNT(gTable) == kBasicStencilFuncCount); + GR_STATIC_ASSERT(SK_ARRAY_COUNT(gTable) == kBasicStencilFuncCnt); GR_STATIC_ASSERT(0 == kAlways_StencilFunc); GR_STATIC_ASSERT(1 == kNever_StencilFunc); GR_STATIC_ASSERT(2 == kGreater_StencilFunc); @@ -142,7 +142,7 @@ VkCompareOp stencil_func_to_vk_compare_op(GrStencilFunc basicFunc) { GR_STATIC_ASSERT(5 == kLEqual_StencilFunc); GR_STATIC_ASSERT(6 == kEqual_StencilFunc); GR_STATIC_ASSERT(7 == kNotEqual_StencilFunc); - SkASSERT((unsigned)basicFunc < kBasicStencilFuncCount); + SkASSERT((unsigned)basicFunc < kBasicStencilFuncCnt); return gTable[basicFunc]; } |