Reuse sampler descriptor set allocations in Vulkan

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2172873003

Review-Url: https://codereview.chromium.org/2172873003

1 files changed, 5 insertions, 3 deletions

diff --git a/src/gpu/vk/GrVkPipelineState.h b/src/gpu/vk/GrVkPipelineState.h
index 8988aa340b..60c1db68d4 100644
--- a/src/gpu/vk/GrVkPipelineState.h
+++ b/src/gpu/vk/GrVkPipelineState.h
@@ -10,6 +10,7 @@
 #define GrVkPipelineState_DEFINED
 
 #include "GrStencilSettings.h"
+#include "GrVkDescriptorSetManager.h"
 #include "GrVkImage.h"
 #include "GrVkProgramDesc.h"
 #include "GrVkPipelineStateDataManager.h"
@@ -151,7 +152,7 @@ private:
                       const GrVkPipelineState::Desc&,
                       GrVkPipeline* pipeline,
                       VkPipelineLayout layout,
-                      VkDescriptorSetLayout dsSamplerLayout,
+                      const GrVkDescriptorSetManager::Handle& samplerDSHandle,
                       const BuiltinUniformHandles& builtinUniformHandles,
                       const UniformInfoArray& uniforms,
                       uint32_t vertexUniformSize,
@@ -260,6 +261,9 @@ private:
     // Once we move samplers over to use the resource provider for descriptor sets we will not need
     // the above array and instead just use GrVkDescriptorSet like the uniform one here.
     const GrVkDescriptorSet* fUniformDescriptorSet;
+    const GrVkDescriptorSet* fSamplerDescriptorSet;
+
+    const GrVkDescriptorSetManager::Handle fSamplerDSHandle;
 
     // Meta data so we know which descriptor sets we are using and need to bind.
     int fStartDS;
@@ -286,8 +290,6 @@ private:
 
     GrVkPipelineStateDataManager fDataManager;
 
-    DescriptorPoolManager fSamplerPoolManager;
-
     int fNumSamplers;
 
     friend class GrVkPipelineStateBuilder;