Unbreak vulkan after stencil constant name changes

src/gpu/vk/GrVkPipeline.cpp

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include "GrVkPipeline.h"
 
 #include "GrGeometryProcessor.h"
@@ skipping 91 matching lines @@
     static const VkStencilOp gTable[] = {
         VK_STENCIL_OP_KEEP,                 // kKeep_StencilOp
         VK_STENCIL_OP_REPLACE,              // kReplace_StencilOp
         VK_STENCIL_OP_INCREMENT_AND_WRAP,   // kIncWrap_StencilOp
         VK_STENCIL_OP_INCREMENT_AND_CLAMP,  // kIncClamp_StencilOp
         VK_STENCIL_OP_DECREMENT_AND_WRAP,   // kDecWrap_StencilOp
         VK_STENCIL_OP_DECREMENT_AND_CLAMP,  // kDecClamp_StencilOp
         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);
     GR_STATIC_ASSERT(3 == kIncClamp_StencilOp);
     GR_STATIC_ASSERT(4 == kDecWrap_StencilOp);
     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];
 }
 
 VkCompareOp stencil_func_to_vk_compare_op(GrStencilFunc basicFunc) {
     static const VkCompareOp gTable[] = {
         VK_COMPARE_OP_ALWAYS,              // kAlways_StencilFunc
         VK_COMPARE_OP_NEVER,               // kNever_StencilFunc
         VK_COMPARE_OP_GREATER,             // kGreater_StencilFunc
         VK_COMPARE_OP_GREATER_OR_EQUAL,    // kGEqual_StencilFunc
         VK_COMPARE_OP_LESS,                // kLess_StencilFunc
         VK_COMPARE_OP_LESS_OR_EQUAL,       // kLEqual_StencilFunc,
         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);
     GR_STATIC_ASSERT(3 == kGEqual_StencilFunc);
     GR_STATIC_ASSERT(4 == kLess_StencilFunc);
     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];
 }
 
 void setup_depth_stencil_state(const GrVkGpu* gpu,
                                const GrStencilSettings& stencilSettings,
                                VkPipelineDepthStencilStateCreateInfo* stencilInfo) {
     memset(stencilInfo, 0, sizeof(VkPipelineDepthStencilStateCreateInfo));
     stencilInfo->sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO;
     stencilInfo->pNext = nullptr;
@@ skipping 392 matching lines @@
 }
 
 void GrVkPipeline::SetDynamicState(GrVkGpu* gpu,
                                    GrVkCommandBuffer* cmdBuffer,
                                    const GrPipeline& pipeline) {
     const GrRenderTarget& target = *pipeline.getRenderTarget();
     set_dynamic_scissor_state(gpu, cmdBuffer, pipeline, target);
     set_dynamic_viewport_state(gpu, cmdBuffer, target);
     set_dynamic_blend_constant_state(gpu, cmdBuffer, pipeline);
 }