Merge building of program desc in Vulkan into one step

src/gpu/vk/GrVkPipelineState.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 "GrVkPipelineState.h"
 
 #include "GrPipeline.h"
@@ skipping 465 matching lines @@
     GR_STATIC_ASSERT(kFirstAdvancedGrBlendEquation - 1 < 4);
 
     uint32_t key = blendInfo.fWriteColor;
     key |= (blendInfo.fSrcBlend << kBlendWriteShift);
     key |= (blendInfo.fDstBlend << (kBlendWriteShift + kBlendCoeffShift));
     key |= (blendInfo.fEquation << (kBlendWriteShift + 2 * kBlendCoeffShift));
 
     return key;
 }
 
-void GrVkPipelineState::BuildStateKey(const GrPipeline& pipeline, GrPrimitiveType primitiveType,
-                                      SkTArray<uint8_t, true>* key) {
-    // Save room for the key length and key header
-    key->reset();
-    key->push_back_n(kData_StateKeyOffset);
+bool GrVkPipelineState::Desc::Build(Desc* desc,
+                                    const GrPrimitiveProcessor& primProc,
+                                    const GrPipeline& pipeline,
+                                    GrPrimitiveType primitiveType,
+                                    const GrGLSLCaps& caps) {
+    if (!INHERITED::Build(desc, primProc, pipeline, caps)) {
+        return false;
+    }
 
-    GrProcessorKeyBuilder b(key);
-
+    GrProcessorKeyBuilder b(&desc->key());
     GrVkRenderTarget* vkRT = (GrVkRenderTarget*)pipeline.getRenderTarget();
     vkRT->simpleRenderPass()->genKey(&b);
 
     pipeline.getStencil().genKey(&b);
 
     SkASSERT(sizeof(GrDrawFace) <= sizeof(uint32_t));
     b.add32((int32_t)pipeline.getDrawFace());
 
     b.add32(get_blend_info_key(pipeline));
 
     b.add32(primitiveType);
 
-    // Set key length
-    int keyLength = key->count();
-    SkASSERT(0 == (keyLength % 4));
-    *reinterpret_cast<uint32_t*>(key->begin()) = SkToU32(keyLength);
+    return true;
 }