Merge building of program desc in Vulkan into one step

src/gpu/vk/GrVkPipelineStateCache.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 "GrVkResourceProvider.h"
 
 #include "GrVkGpu.h"
@@ skipping 11 matching lines @@
 
 struct GrVkResourceProvider::PipelineStateCache::Entry {
 
     Entry() : fPipelineState(nullptr) {}
 
     static const GrVkPipelineState::Desc& GetKey(const Entry* entry) {
         return entry->fPipelineState->getDesc();
     }
 
     static uint32_t Hash(const GrVkPipelineState::Desc& key) {
-        return key.fChecksum;
+        return key.getChecksum();
     }
 
     sk_sp<GrVkPipelineState> fPipelineState;
 
 private:
     SK_DECLARE_INTERNAL_LLIST_INTERFACE(Entry);
 };
 
 GrVkResourceProvider::PipelineStateCache::PipelineStateCache(GrVkGpu* gpu)
     : fCount(0)
@@ skipping 49 matching lines @@
 sk_sp<GrVkPipelineState> GrVkResourceProvider::PipelineStateCache::refPipelineState(
                                                                const GrPipeline& pipeline,
                                                                const GrPrimitiveProcessor& primProc,
                                                                GrPrimitiveType primitiveType,
                                                                const GrVkRenderPass& renderPass) {
 #ifdef GR_PIPELINE_STATE_CACHE_STATS
     ++fTotalRequests;
 #endif
     // Get GrVkProgramDesc
     GrVkPipelineState::Desc desc;
-    if (!GrProgramDesc::Build(&desc.fProgramDesc, primProc, pipeline, *fGpu->vkCaps().glslCaps())) {
+    if (!GrVkPipelineState::Desc::Build(&desc, primProc, pipeline, primitiveType,
+                                        *fGpu->vkCaps().glslCaps())) {
         GrCapsDebugf(fGpu->caps(), "Failed to build vk program descriptor!\n");
         return nullptr;
     }
-    desc.fProgramDesc.finalize();
-
-    // Get vulkan specific descriptor key
-    GrVkPipelineState::BuildStateKey(pipeline, primitiveType, &desc.fStateKey);
-    // Get checksum of entire PipelineDesc
-    int keyLength = desc.fStateKey.count();
-    SkASSERT(0 == (keyLength % 4));
-    // Seed the checksum with the checksum of the programDesc then add the vulkan key to it.
-    desc.fChecksum = SkOpts::hash(desc.fStateKey.begin(), keyLength,
-                                  desc.fProgramDesc.getChecksum());
+    desc.finalize();
 
     Entry* entry = nullptr;
     if (Entry** entryptr = fHashTable.find(desc)) {
         SkASSERT(*entryptr);
         entry = *entryptr;
     }
     if (!entry) {
 #ifdef GR_PIPELINE_STATE_CACHE_STATS
         ++fCacheMisses;
 #endif
@@ skipping 20 matching lines @@
         entry->fPipelineState = std::move(pipelineState);
         fHashTable.set(entry);
         fLRUList.addToTail(entry);
         return entry->fPipelineState;
     } else {
         fLRUList.remove(entry);
         fLRUList.addToTail(entry);
     }
     return entry->fPipelineState;
 }