Merge GrGLSLProgramDesc into GrProgramDesc

src/gpu/vk/GrVkPipelineState.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrVkPipelineState_DEFINED
 #define GrVkPipelineState_DEFINED
 
+#include "GrProgramDesc.h"
 #include "GrStencilSettings.h"
 #include "GrVkDescriptorSetManager.h"
 #include "GrVkImage.h"
 #include "GrVkPipelineStateDataManager.h"
 #include "glsl/GrGLSLProgramBuilder.h"
-#include "glsl/GrGLSLProgramDesc.h"
 
 #include "vk/GrVkDefines.h"
 
 class GrPipeline;
 class GrVkCommandBuffer;
 class GrVkDescriptorPool;
 class GrVkDescriptorSet;
 class GrVkGpu;
 class GrVkImageView;
 class GrVkPipeline;
@@ skipping 51 matching lines @@
      * pipeline. This includes stencil settings, blending information, render pass format, draw face
      * information, and primitive type. Note that some state is set dynamically on the pipeline for
      * each draw  and thus is not included in this descriptor. This includes the viewport, scissor,
      * and blend constant.
      *
      * A checksum which includes the fProgramDesc and fStateKey is included at the top of the Desc
      * for caching purposes and faster equality checks.
      */
     struct Desc {
         uint32_t                fChecksum;
-        GrGLSLProgramDesc       fProgramDesc;
+        GrProgramDesc           fProgramDesc;
 
         enum {
             kRenderPassKeyAlloc = 12, // This is typical color attachment with no stencil or msaa
             kStencilKeyAlloc = sizeof(GrStencilSettings),
             kDrawFaceKeyAlloc = 4,
             kBlendingKeyAlloc = 4,
             kPrimitiveTypeKeyAlloc = 4,
             kPreAllocSize = kData_StateKeyOffset + kRenderPassKeyAlloc + kStencilKeyAlloc +
                             kDrawFaceKeyAlloc + kBlendingKeyAlloc + kPrimitiveTypeKeyAlloc,
         };
@@ skipping 189 matching lines @@
     Desc fDesc;
 
     GrVkPipelineStateDataManager fDataManager;
 
     int fNumSamplers;
 
     friend class GrVkPipelineStateBuilder;
 };
 
 #endif