Merge GrGLSLProgramDesc into GrProgramDesc

src/gpu/vk/GrVkPipelineStateCache.cpp

Index: src/gpu/vk/GrVkPipelineStateCache.cpp
diff --git a/src/gpu/vk/GrVkPipelineStateCache.cpp b/src/gpu/vk/GrVkPipelineStateCache.cpp
index d404a8d444e61a7d4ad013c675d6283b3335cc73..1becad5adf2709e626c636f780bf89229d79fc9e 100644
--- a/src/gpu/vk/GrVkPipelineStateCache.cpp
+++ b/src/gpu/vk/GrVkPipelineStateCache.cpp
@@ -99,13 +99,11 @@ sk_sp<GrVkPipelineState> GrVkResourceProvider::PipelineStateCache::refPipelineSt
 #endif
     // Get GrVkProgramDesc
     GrVkPipelineState::Desc desc;
-    if (!GrGLSLProgramDescBuilder::Build(&desc.fProgramDesc,
-                                         primProc,
-                                         pipeline,
-                                         *fGpu->vkCaps().glslCaps())) {
+    if (!GrProgramDesc::Build(&desc.fProgramDesc, primProc, pipeline, *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);