Unify DescriptorPools for vulkan uniform descriptor sets

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
@@ skipping 131 matching lines @@
     const Desc& getDesc() { return fDesc; }
 
 private:
     typedef GrVkPipelineStateDataManager::UniformInfoArray UniformInfoArray;
     typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
 
     GrVkPipelineState(GrVkGpu* gpu,
                       const GrVkPipelineState::Desc&,
                       GrVkPipeline* pipeline,
                       VkPipelineLayout layout,
-                      VkDescriptorSetLayout dsLayout[2],
+                      VkDescriptorSetLayout dsSamplerLayout,
                       const BuiltinUniformHandles& builtinUniformHandles,
                       const UniformInfoArray& uniforms,
                       uint32_t vertexUniformSize,
                       uint32_t fragmentUniformSize,
                       uint32_t numSamplers,
                       GrGLSLPrimitiveProcessor* geometryProcessor,
                       GrGLSLXferProcessor* xferProcessor,
                       const GrGLSLFragProcs& fragmentProcessors);
 
     // Each pool will manage one type of descriptor. Thus each descriptor set we use will all be of
@@ skipping 110 matching lines @@
     // Processors in the GrVkPipelineState
     SkAutoTDelete<GrGLSLPrimitiveProcessor> fGeometryProcessor;
     SkAutoTDelete<GrGLSLXferProcessor> fXferProcessor;
     GrGLSLFragProcs fFragmentProcessors;
 
     Desc fDesc;
 
     GrVkPipelineStateDataManager fDataManager;
 
     DescriptorPoolManager fSamplerPoolManager;
-    DescriptorPoolManager fUniformPoolManager;
+    const GrVkDescriptorPool*   fCurrentUniformDescPool;
 
     int fNumSamplers;
 
     friend class GrVkPipelineStateBuilder;
 };
 
 #endif