Merge ProgramDesc's for GL and Vulkan

src/gpu/vk/GrVkPipelineState.h

Index: src/gpu/vk/GrVkPipelineState.h
diff --git a/src/gpu/vk/GrVkPipelineState.h b/src/gpu/vk/GrVkPipelineState.h
index 60c1db68d4f86d72a3d87c2d68928cdf1f77e140..f92cdeabab7bd893c9ea8ab2e6cdf835ace2cf7d 100644
--- a/src/gpu/vk/GrVkPipelineState.h
+++ b/src/gpu/vk/GrVkPipelineState.h
@@ -12,9 +12,9 @@
 #include "GrStencilSettings.h"
 #include "GrVkDescriptorSetManager.h"
 #include "GrVkImage.h"
-#include "GrVkProgramDesc.h"
 #include "GrVkPipelineStateDataManager.h"
 #include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDesc.h"
 
 #include "vk/GrVkDefines.h"
 
@@ -72,7 +72,7 @@ public:
      * For Vulkan we want to cache the entire VkPipeline for reuse of draws. The Desc here holds all
      * the information needed to differentiate one pipeline from another.
      *
-     * The GrVkProgramDesc contains all the information need to create the actual shaders for the
+     * The GrGLSLProgramDesc contains all the information need to create the actual shaders for the
      * pipeline.
      *
      * The fStateKey is used to store all the inputs for the rest of the state stored on the
@@ -86,7 +86,7 @@ public:
      */
     struct Desc {
         uint32_t                fChecksum;
-        GrVkProgramDesc         fProgramDesc;
+        GrGLSLProgramDesc       fProgramDesc;
 
         enum {
             kRenderPassKeyAlloc = 12, // This is typical color attachment with no stencil or msaa