Vulkan: Pass vk::Context to BufferHelper::init.

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -3743,11 +3743,6 @@ void ContextVk::insertWaitSemaphore(const vk::Semaphore *waitSemaphore)
     mWaitSemaphores.push_back(waitSemaphore->getHandle());
 }
 
-bool ContextVk::shouldFlush()
-{
-    return getRenderer()->shouldCleanupGarbage();
-}
-
 bool ContextVk::hasRecordedCommands()
 {
     ASSERT(mOutsideRenderPassCommands && mRenderPassCommands);

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -368,7 +368,6 @@ class ContextVk : public ContextImpl, public vk::Context
 
     void insertWaitSemaphore(const vk::Semaphore *waitSemaphore);
 
-    bool shouldFlush();
     angle::Result flushImpl(const vk::Semaphore *semaphore);
     angle::Result finishImpl();
 

src/libANGLE/renderer/vulkan/RendererVk.h

@@ -244,11 +244,6 @@ class RendererVk : angle::NonCopyable
 
     void onCompletedSerial(Serial serial);
 
-    bool shouldCleanupGarbage()
-    {
-        return (mSharedGarbage.size() > mGarbageCollectionFlushThreshold);
-    }
-
     bool enableDebugUtils() const { return mEnableDebugUtils; }
 
     SamplerCache &getSamplerCache() { return mSamplerCache; }

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -2126,19 +2126,11 @@ BufferHelper::BufferHelper()
 
 BufferHelper::~BufferHelper() = default;
 
-angle::Result BufferHelper::init(ContextVk *contextVk,
+angle::Result BufferHelper::init(Context *context,
                                  const VkBufferCreateInfo &requestedCreateInfo,
                                  VkMemoryPropertyFlags memoryPropertyFlags)
 {
-    RendererVk *renderer = contextVk->getRenderer();
-
-    // TODO: Remove with anglebug.com/2162: Vulkan: Implement device memory sub-allocation
-    // Check if we have too many resources allocated already and need to free some before allocating
-    // more and (possibly) exceeding the device's limits.
-    if (contextVk->shouldFlush())
-    {
-        ANGLE_TRY(contextVk->flushImpl(nullptr));
-    }
+    RendererVk *renderer = context->getRenderer();
 
     mSize = requestedCreateInfo.size;
 
@@ -2163,7 +2155,7 @@ angle::Result BufferHelper::init(ContextVk *contextVk,
         renderer->getAllocator(), createInfo, requiredFlags, preferredFlags,
         renderer->getFeatures().persistentlyMappedBuffers.enabled, &mBuffer, &mMemoryPropertyFlags);
 
-    mCurrentQueueFamilyIndex = contextVk->getRenderer()->getQueueFamilyIndex();
+    mCurrentQueueFamilyIndex = renderer->getQueueFamilyIndex();
 
     if (renderer->getFeatures().allocateNonZeroMemory.enabled)
     {
@@ -2173,7 +2165,7 @@ angle::Result BufferHelper::init(ContextVk *contextVk,
         if ((mMemoryPropertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0 &&
             (requestedCreateInfo.usage & VK_BUFFER_USAGE_TRANSFER_DST_BIT) != 0)
         {
-            ANGLE_TRY(initializeNonZeroMemory(contextVk, createInfo->size));
+            ANGLE_TRY(initializeNonZeroMemory(context, createInfo->size));
         }
         else if ((mMemoryPropertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0)
         {

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -685,7 +685,7 @@ class BufferHelper final : public Resource
     BufferHelper();
     ~BufferHelper() override;
 
-    angle::Result init(ContextVk *contextVk,
+    angle::Result init(Context *context,
                        const VkBufferCreateInfo &createInfo,
                        VkMemoryPropertyFlags memoryPropertyFlags);
     void destroy(RendererVk *renderer);