Vulkan: Move "null" buffer to RendererVk.

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -504,6 +504,7 @@ void RendererVk::onDestroy()
 
     mPipelineCache.destroy(mDevice);
     mSamplerCache.destroy(this);
+    mTheNullBuffer.destroy(this);
 
     mAllocator.destroy();
 
@@ -830,6 +831,16 @@ angle::Result RendererVk::initialize(DisplayVk *displayVk,
     // Store the physical device memory properties so we can find the right memory pools.
     mMemoryProperties.init(mPhysicalDevice);
 
+    // Must be initialized after the allocator and memory properties.
+    {
+        VkBufferCreateInfo bufferCreateInfo = {};
+        bufferCreateInfo.sType              = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
+        bufferCreateInfo.size               = 16;
+        bufferCreateInfo.usage              = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT;
+        ANGLE_TRY(
+            mTheNullBuffer.init(displayVk, bufferCreateInfo, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT));
+    }
+
     if (!mGlslangInitialized)
     {
         GlslangInitialize();

src/libANGLE/renderer/vulkan/RendererVk.h

@@ -256,6 +256,8 @@ class RendererVk : angle::NonCopyable
     }
     void waitForWorkerThreadIdle() { mCommandProcessor.waitForWorkComplete(); }
 
+    vk::BufferHelper &getNullBuffer() { return mTheNullBuffer; }
+
   private:
     angle::Result initializeDevice(DisplayVk *displayVk, uint32_t queueFamilyIndex);
     void ensureCapsInitialized() const;
@@ -379,6 +381,9 @@ class RendererVk : angle::NonCopyable
     vk::Allocator mAllocator;
     SamplerCache mSamplerCache;
     vk::ActiveHandleCounter mActiveHandleCounts;
+
+    // Vulkan does not allow binding a null vertex buffer. We use a dummy as a placeholder.
+    vk::BufferHelper mTheNullBuffer;
 };
 
 }  // namespace rx

src/libANGLE/renderer/vulkan/VertexArrayVk.cpp

@@ -123,16 +123,12 @@ VertexArrayVk::VertexArrayVk(ContextVk *contextVk, const gl::VertexArrayState &s
 {
     RendererVk *renderer = contextVk->getRenderer();
 
-    VkBufferCreateInfo createInfo = {};
-    createInfo.sType              = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
-    createInfo.size               = 16;
-    createInfo.usage              = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT;
-    (void)mTheNullBuffer.init(contextVk, createInfo, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
+    vk::BufferHelper &nullBuffer = renderer->getNullBuffer();
 
-    mCurrentArrayBufferHandles.fill(mTheNullBuffer.getBuffer().getHandle());
+    mCurrentArrayBufferHandles.fill(nullBuffer.getBuffer().getHandle());
     mCurrentArrayBufferOffsets.fill(0);
     mCurrentArrayBufferRelativeOffsets.fill(0);
-    mCurrentArrayBuffers.fill(&mTheNullBuffer);
+    mCurrentArrayBuffers.fill(&nullBuffer);
 
     mDynamicVertexData.init(renderer, vk::kVertexBufferUsageFlags, vk::kVertexBufferAlignment,
                             kDynamicVertexDataSize, true);
@@ -155,8 +151,6 @@ void VertexArrayVk::destroy(const gl::Context *context)
 
     RendererVk *renderer = contextVk->getRenderer();
 
-    mTheNullBuffer.release(renderer);
-
     mDynamicVertexData.release(renderer);
     mDynamicIndexData.release(renderer);
     mTranslatedByteIndexData.release(renderer);
@@ -557,9 +551,9 @@ angle::Result VertexArrayVk::syncDirtyAttrib(ContextVk *contextVk,
                                              size_t attribIndex,
                                              bool bufferOnly)
 {
+    RendererVk *renderer = contextVk->getRenderer();
     if (attrib.enabled)
     {
-        RendererVk *renderer           = contextVk->getRenderer();
         const vk::Format &vertexFormat = renderer->getFormat(attrib.format->id);
 
         GLuint stride;
@@ -621,9 +615,10 @@ angle::Result VertexArrayVk::syncDirtyAttrib(ContextVk *contextVk,
             {
                 if (bufferVk->getSize() == 0)
                 {
-                    mCurrentArrayBuffers[attribIndex] = &mTheNullBuffer;
-                    mCurrentArrayBufferHandles[attribIndex] =
-                        mTheNullBuffer.getBuffer().getHandle();
+                    vk::BufferHelper &nullBuffer = renderer->getNullBuffer();
+
+                    mCurrentArrayBuffers[attribIndex]       = &nullBuffer;
+                    mCurrentArrayBufferHandles[attribIndex] = nullBuffer.getBuffer().getHandle();
                     mCurrentArrayBufferOffsets[attribIndex] = 0;
                     stride                                  = 0;
                 }
@@ -644,8 +639,9 @@ angle::Result VertexArrayVk::syncDirtyAttrib(ContextVk *contextVk,
         }
         else
         {
-            mCurrentArrayBuffers[attribIndex]       = &mTheNullBuffer;
-            mCurrentArrayBufferHandles[attribIndex] = mTheNullBuffer.getBuffer().getHandle();
+            vk::BufferHelper &nullBuffer            = renderer->getNullBuffer();
+            mCurrentArrayBuffers[attribIndex]       = &nullBuffer;
+            mCurrentArrayBufferHandles[attribIndex] = nullBuffer.getBuffer().getHandle();
             mCurrentArrayBufferOffsets[attribIndex] = 0;
             // Client side buffer will be transfered to a tightly packed buffer later
             stride = vertexFormat.actualBufferFormat().pixelBytes;
@@ -675,8 +671,9 @@ angle::Result VertexArrayVk::syncDirtyAttrib(ContextVk *contextVk,
         contextVk->invalidateDefaultAttribute(attribIndex);
 
         // These will be filled out by the ContextVk.
-        mCurrentArrayBuffers[attribIndex]               = &mTheNullBuffer;
-        mCurrentArrayBufferHandles[attribIndex]         = mTheNullBuffer.getBuffer().getHandle();
+        vk::BufferHelper &nullBuffer                    = renderer->getNullBuffer();
+        mCurrentArrayBuffers[attribIndex]               = &nullBuffer;
+        mCurrentArrayBufferHandles[attribIndex]         = nullBuffer.getBuffer().getHandle();
         mCurrentArrayBufferOffsets[attribIndex]         = 0;
         mCurrentArrayBufferStrides[attribIndex]         = 0;
         mCurrentArrayBufferRelativeOffsets[attribIndex] = 0;

src/libANGLE/renderer/vulkan/VertexArrayVk.h

@@ -158,9 +158,6 @@ class VertexArrayVk : public VertexArrayImpl
     Optional<size_t> mLineLoopBufferLastIndex;
     bool mDirtyLineLoopTranslation;
 
-    // Vulkan does not allow binding a null vertex buffer. We use a dummy as a placeholder.
-    vk::BufferHelper mTheNullBuffer;
-
     // Track client and/or emulated attribs that we have to stream their buffer contents
     gl::AttributesMask mStreamingVertexAttribsMask;
 };