Unify DescriptorPools for vulkan uniform descriptor sets

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 ad3afa7314b2261808ae8627d7c603fa198f06cf..b7f954ccbdd915cec911a192de79ecb665469fdd 100644
--- a/src/gpu/vk/GrVkPipelineState.h
+++ b/src/gpu/vk/GrVkPipelineState.h
@@ -149,7 +149,7 @@ private:
                       const GrVkPipelineState::Desc&,
                       GrVkPipeline* pipeline,
                       VkPipelineLayout layout,
-                      VkDescriptorSetLayout dsLayout[2],
+                      VkDescriptorSetLayout dsSamplerLayout,
                       const BuiltinUniformHandles& builtinUniformHandles,
                       const UniformInfoArray& uniforms,
                       uint32_t vertexUniformSize,
@@ -280,7 +280,7 @@ private:
     GrVkPipelineStateDataManager fDataManager;
 
     DescriptorPoolManager fSamplerPoolManager;
-    DescriptorPoolManager fUniformPoolManager;
+    const GrVkDescriptorPool*   fCurrentUniformDescPool;
 
     int fNumSamplers;