Remove unused GrVkDescriptorSetManager factor.

Change-Id: I50476e8b8bc9796656cb87cdbd6ec0fe83819f0e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/314496 Commit-Queue: Jim Van Verth <jvanverth@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Auto-Submit: Greg Daniel <egdaniel@google.com>
skia-flutter-autoroll · Sep 2, 2020 · e9a9ad9 · e9a9ad9
1 parent c0dd06d
commit e9a9ad9
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 56 deletions.
diff --git a/src/gpu/vk/GrVkDescriptorSetManager.cpp b/src/gpu/vk/GrVkDescriptorSetManager.cpp
@@ -39,16 +39,6 @@ GrVkDescriptorSetManager* GrVkDescriptorSetManager::CreateSamplerManager(
     return Create(gpu, type, visibilities, immutableSamplers);
 }
 
-GrVkDescriptorSetManager* GrVkDescriptorSetManager::CreateSamplerManager(
-        GrVkGpu* gpu, VkDescriptorType type, const SkTArray<uint32_t>& visibilities) {
-    SkSTArray<4, const GrVkSampler*> immutableSamplers;
-    SkASSERT(type == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER);
-    for (int i = 0 ; i < visibilities.count(); ++i) {
-        immutableSamplers.push_back(nullptr);
-    }
-    return Create(gpu, type, visibilities, immutableSamplers);
-}
-
 VkShaderStageFlags visibility_to_vk_stage_flags(uint32_t visibility) {
     VkShaderStageFlags flags = 0;
 
@@ -254,26 +244,6 @@ bool GrVkDescriptorSetManager::isCompatible(VkDescriptorType type,
     return true;
 }
 
-bool GrVkDescriptorSetManager::isCompatible(VkDescriptorType type,
-                                            const SkTArray<uint32_t>& visibilities) const {
-    if (type != fPoolManager.fDescType) {
-        return false;
-    }
-
-    if (VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER == type ||
-        VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER == type) {
-        if (fBindingVisibilities.count() != visibilities.count()) {
-            return false;
-        }
-        for (int i = 0; i < visibilities.count(); ++i) {
-            if (visibilities[i] != fBindingVisibilities[i] || fImmutableSamplers[i] != nullptr) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 GrVkDescriptorSetManager::DescriptorPoolManager::DescriptorPoolManager(

diff --git a/src/gpu/vk/GrVkDescriptorSetManager.h b/src/gpu/vk/GrVkDescriptorSetManager.h
@@ -30,8 +30,6 @@ class GrVkDescriptorSetManager {
     static GrVkDescriptorSetManager* CreateUniformManager(GrVkGpu* gpu);
     static GrVkDescriptorSetManager* CreateSamplerManager(GrVkGpu* gpu, VkDescriptorType type,
                                                           const GrVkUniformHandler&);
-    static GrVkDescriptorSetManager* CreateSamplerManager(GrVkGpu* gpu, VkDescriptorType type,
-                                                          const SkTArray<uint32_t>& visibilities);
 
     ~GrVkDescriptorSetManager() {}
 
@@ -44,8 +42,6 @@ class GrVkDescriptorSetManager {
     void recycleDescriptorSet(const GrVkDescriptorSet*);
 
     bool isCompatible(VkDescriptorType type, const GrVkUniformHandler*) const;
-    bool isCompatible(VkDescriptorType type,
-                      const SkTArray<uint32_t>& visibilities) const;
 
 private:
     struct DescriptorPoolManager {

diff --git a/src/gpu/vk/GrVkResourceProvider.cpp b/src/gpu/vk/GrVkResourceProvider.cpp
@@ -280,25 +280,6 @@ void GrVkResourceProvider::getSamplerDescriptorSetHandle(VkDescriptorType type,
     *handle = GrVkDescriptorSetManager::Handle(fDescriptorSetManagers.count() - 1);
 }
 
-void GrVkResourceProvider::getSamplerDescriptorSetHandle(VkDescriptorType type,
-                                                         const SkTArray<uint32_t>& visibilities,
-                                                         GrVkDescriptorSetManager::Handle* handle) {
-    SkASSERT(handle);
-    SkASSERT(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER == type ||
-             VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER == type);
-    for (int i = 0; i < fDescriptorSetManagers.count(); ++i) {
-        if (fDescriptorSetManagers[i]->isCompatible(type, visibilities)) {
-            *handle = GrVkDescriptorSetManager::Handle(i);
-            return;
-        }
-    }
-
-    GrVkDescriptorSetManager* dsm = GrVkDescriptorSetManager::CreateSamplerManager(fGpu, type,
-                                                                                   visibilities);
-    fDescriptorSetManagers.emplace_back(dsm);
-    *handle = GrVkDescriptorSetManager::Handle(fDescriptorSetManagers.count() - 1);
-}
-
 VkDescriptorSetLayout GrVkResourceProvider::getUniformDSLayout() const {
     SkASSERT(fUniformDSHandle.isValid());
     return fDescriptorSetManagers[fUniformDSHandle.toIndex()]->layout();

diff --git a/src/gpu/vk/GrVkResourceProvider.h b/src/gpu/vk/GrVkResourceProvider.h
@@ -128,9 +128,6 @@ class GrVkResourceProvider {
     void getSamplerDescriptorSetHandle(VkDescriptorType type,
                                        const GrVkUniformHandler&,
                                        GrVkDescriptorSetManager::Handle* handle);
-    void getSamplerDescriptorSetHandle(VkDescriptorType type,
-                                       const SkTArray<uint32_t>& visibilities,
-                                       GrVkDescriptorSetManager::Handle* handle);
 
     // Returns the compatible VkDescriptorSetLayout to use for uniform buffers. The caller does not
     // own the VkDescriptorSetLayout and thus should not delete it. This function should be used