Reuse sampler descriptor set allocations in Vulkan

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 "GrStencilSettings.h"
+#include "GrVkDescriptorSetManager.h"
 #include "GrVkImage.h"
 #include "GrVkProgramDesc.h"
 #include "GrVkPipelineStateDataManager.h"
 #include "glsl/GrGLSLProgramBuilder.h"
 
 #include "vk/GrVkDefines.h"
 
 class GrPipeline;
 class GrVkCommandBuffer;
 class GrVkDescriptorPool;
@@ skipping 121 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 dsSamplerLayout,
+                      const GrVkDescriptorSetManager::Handle& samplerDSHandle,
                       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 88 matching lines @@
     // The DescriptorSets need to survive until the gpu has finished all draws that use them.
     // However, they will only be freed by the descriptor pool. Thus by simply keeping the
     // descriptor pool alive through the draw, the descritor sets will also stay alive. Thus we do
     // not need a GrVkResource versions of VkDescriptorSet. We hold on to these in the
     // GrVkPipelineState since we update the descriptor sets and bind them at separate times;
     VkDescriptorSet fDescriptorSets[2];
 
     // 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;
     int fDSCount;
 
     SkAutoTDelete<GrVkUniformBuffer> fVertexUniformBuffer;
     SkAutoTDelete<GrVkUniformBuffer> fFragmentUniformBuffer;
 
     // GrVkResources used for sampling textures
     SkTDArray<GrVkSampler*> fSamplers;
     SkTDArray<const GrVkImageView*> fTextureViews;
     SkTDArray<const GrVkResource*> fTextures;
 
     // Tracks the current render target uniforms stored in the vertex buffer.
     RenderTargetState fRenderTargetState;
     BuiltinUniformHandles fBuiltinUniformHandles;
 
     // Processors in the GrVkPipelineState
     SkAutoTDelete<GrGLSLPrimitiveProcessor> fGeometryProcessor;
     SkAutoTDelete<GrGLSLXferProcessor> fXferProcessor;
     GrGLSLFragProcs fFragmentProcessors;
 
     Desc fDesc;
 
     GrVkPipelineStateDataManager fDataManager;
 
-    DescriptorPoolManager fSamplerPoolManager;
-
     int fNumSamplers;
 
     friend class GrVkPipelineStateBuilder;
 };
 
 #endif