Set up cache in vulkan to reuse GrVkPrograms (aka VkPipelines)

src/gpu/vk/GrVkProgramBuilder.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 "vk/GrVkProgramBuilder.h"
 
 #include "vk/GrVkGpu.h"
 #include "vk/GrVkRenderPass.h"
-#include "vk/GrVkProgram.h"
 
 GrVkProgram* GrVkProgramBuilder::CreateProgram(GrVkGpu* gpu,
                                                const GrPipeline& pipeline,
                                                const GrPrimitiveProcessor& primProc,
                                                GrPrimitiveType primitiveType,
-                                               const GrVkProgramDesc& desc,
+                                               const GrVkProgram::PipelineDesc& desc,
                                                const GrVkRenderPass& renderPass) {
     // create a builder.  This will be handed off to effects so they can use it to add
     // uniforms, varyings, textures, etc
-    GrVkProgramBuilder builder(gpu, pipeline, primProc, desc);
+    GrVkProgramBuilder builder(gpu, pipeline, primProc, desc.fProgramDesc);
 
     GrGLSLExpr4 inputColor;
     GrGLSLExpr4 inputCoverage;
 
     if (!builder.emitAndInstallProcs(&inputColor, &inputCoverage)) {
         builder.cleanupFragmentProcessors();
         return nullptr;
     }
 
-    return builder.finalize(primitiveType, renderPass);
+    return builder.finalize(primitiveType, renderPass, desc);
 }
 
 GrVkProgramBuilder::GrVkProgramBuilder(GrVkGpu* gpu,
                                        const GrPipeline& pipeline,
                                        const GrPrimitiveProcessor& primProc,
                                        const GrVkProgramDesc& desc)
     : INHERITED(pipeline, primProc, desc) 
     , fGpu(gpu)
     , fVaryingHandler(this) 
     , fUniformHandler(this) {
@@ skipping 91 matching lines @@
     stageInfo->flags = 0;
     stageInfo->stage = stage;
     stageInfo->module = *shaderModule;
     stageInfo->pName = "main";
     stageInfo->pSpecializationInfo = nullptr;
 
     return true;
 }
 
 GrVkProgram* GrVkProgramBuilder::finalize(GrPrimitiveType primitiveType,
-                                          const GrVkRenderPass& renderPass) {
+                                          const GrVkRenderPass& renderPass,
+                                          const GrVkProgram::PipelineDesc& desc) {
     VkDescriptorSetLayout dsLayout[2];
     VkPipelineLayout pipelineLayout;
     VkShaderModule vertShaderModule;
     VkShaderModule fragShaderModule;
 
     uint32_t numSamplers = fSamplerUniforms.count();
 
     SkAutoTDeleteArray<VkDescriptorSetLayoutBinding> dsSamplerBindings(
                                                      new VkDescriptorSetLayoutBinding[numSamplers]);
     for (uint32_t i = 0; i < numSamplers; ++i) {
@@ skipping 111 matching lines @@
         GR_VK_CALL(fGpu->vkInterface(), DestroyPipelineLayout(fGpu->device(), pipelineLayout,
                                                               nullptr));
         GR_VK_CALL(fGpu->vkInterface(), DestroyDescriptorSetLayout(fGpu->device(), dsLayout[0],
                                                                    nullptr));
         GR_VK_CALL(fGpu->vkInterface(), DestroyDescriptorSetLayout(fGpu->device(), dsLayout[1],
                                                                    nullptr));
         return nullptr;
     }
 
     return new GrVkProgram(fGpu,
+                           desc,
                            pipeline,
                            pipelineLayout,
                            dsLayout,
                            fUniformHandles,
                            fUniformHandler.fUniforms,
                            fUniformHandler.fCurrentVertexUBOOffset,
                            fUniformHandler.fCurrentFragmentUBOOffset,
                            numSamplers,
                            fGeometryProcessor,
                            fXferProcessor,
                            fFragmentProcessors);
 }