Vulkan: MapBufferRange should avoid wait if INVALIDATE_BUFFER is set

If glMapBufferRange is called with GL_MAP_INVALIDATE_BUFFER_BIT bit set, caller indicates that it don't care about the previous content. If the buffer is busy, instead of wait for GPU to finish and then map the buffer, we should just allocate a new memory and return it. brawl_stars is hitting this case. With this CL, the frame time is cutting to half on the pixel device. Bug: b/175905404 Change-Id: If1220f07ebf53dd28fe6a4732eaba84e2e57598e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2597784Reviewed-by: Tim Van Patten <timvp@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Charlie Lao <cclao@google.com>

Vulkan: MapBufferRange should avoid wait if INVALIDATE_BUFFER is set
0c5a55a5 · Charlie Lao · Commit Bot · 4e2b6d6b · 0c5a55a5
Commit 0c5a55a5 authored Dec 17, 2020 by Charlie Lao Committed by Commit Bot Dec 21, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

BufferVk.cpp src/libANGLE/renderer/vulkan/BufferVk.cpp +11 -1

No files found.
--- a/src/libANGLE/renderer/vulkan/BufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/BufferVk.cpp
@@ -457,7 +457,17 @@ angle::Result BufferVk::mapRangeImpl(ContextVk *contextVk,
    {
        ASSERT(mBuffer && mBuffer->valid());

-        if ((access & GL_MAP_UNSYNCHRONIZED_BIT) == 0)
+        if ((access & GL_MAP_INVALIDATE_BUFFER_BIT) != 0 &&
+            mBuffer->isCurrentlyInUse(contextVk->getLastCompletedQueueSerial()))
+        {
+            // We try to map buffer, but buffer is busy. Caller has told us it doesn't care about
+            // previous content. Instead of wait for GPU to finish, we just allocate a new buffer.
+            RendererVk *renderer = contextVk->getRenderer();
+            mBuffer->release(renderer);
+            ANGLE_TRY(
+                acquireBufferHelper(contextVk, static_cast<size_t>(mState.getSize()), &mBuffer));
+        }
+        else if ((access & GL_MAP_UNSYNCHRONIZED_BIT) == 0)
        {
            ANGLE_TRY(mBuffer->waitForIdle(contextVk,
                                           "GPU stall due to mapping buffer in use by the GPU"));