commit 22f12fedf0ffd3df646cce86ed0aaf297add33e6
author Jamie Madill <jmadill@chromium.org> Sun Apr 08 14:23:40 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Wed Apr 11 12:43:41 2018 +0000
tree 6e42d3ab7e5acdf7d6be10f9dde6281cc04a5438
parent d8c632c8654ca1f78ea85d9a0c1edbe06f0d33ff

Vulkan: Rename vk::LineLoopHelper.

This more closely follows the general pattern laid out by the naming
in vk_helpers.h. It also changes the dynamic buffer that the helper
wraps to be stored by-value since the header include order problem is
fixed.

Bug: angleproject:2318
Change-Id: I1de9e1edee2125d3afd490b4f9c99cf70c61215c
Reviewed-on: https://chromium-review.googlesource.com/1001654
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Luc Ferron <lucferron@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/vulkan/VertexArrayVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp b/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
index 1562a91..aa573fe 100644
--- a/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
+++ b/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
@@ -61,7 +61,7 @@
 
     mDynamicVertexData.destroy(device);
     mDynamicIndexData.destroy(device);
-    mLineLoopHandler.destroy(device);
+    mLineLoopHelper.destroy(device);
 }
 
 gl::Error VertexArrayVk::streamVertexData(RendererVk *renderer,
@@ -356,9 +356,9 @@
         mLineLoopBufferFirstIndex != drawCallParams.firstVertex() ||
         mLineLoopBufferLastIndex != lastVertex)
     {
-        ANGLE_TRY(mLineLoopHandler.createIndexBuffer(renderer, drawCallParams,
-                                                     &mCurrentElementArrayBufferHandle,
-                                                     &mCurrentElementArrayBufferOffset));
+        ANGLE_TRY(mLineLoopHelper.getIndexBufferForDrawArrays(renderer, drawCallParams,
+                                                              &mCurrentElementArrayBufferHandle,
+                                                              &mCurrentElementArrayBufferOffset));
 
         mLineLoopBufferFirstIndex = drawCallParams.firstVertex();
         mLineLoopBufferLastIndex  = lastVertex;
@@ -367,7 +367,7 @@
     commandBuffer->bindIndexBuffer(mCurrentElementArrayBufferHandle,
                                    mCurrentElementArrayBufferOffset, VK_INDEX_TYPE_UINT32);
 
-    vk::LineLoopHandler::Draw(drawCallParams.vertexCount(), commandBuffer);
+    vk::LineLoopHelper::Draw(drawCallParams.vertexCount(), commandBuffer);
 
     return gl::NoError();
 }
@@ -403,13 +403,13 @@
     // This also doesn't check if the element type changed, which should trigger translation.
     if (mDirtyLineLoopTranslation)
     {
-        ANGLE_TRY(mLineLoopHandler.createIndexBufferFromElementArrayBuffer(
+        ANGLE_TRY(mLineLoopHelper.getIndexBufferForElementArrayBuffer(
             renderer, elementArrayBufferVk, indexType, drawCallParams.indexCount(),
             &mCurrentElementArrayBufferHandle, &mCurrentElementArrayBufferOffset));
     }
 
     ANGLE_TRY(onIndexedDraw(context, renderer, drawCallParams, drawNode, newCommandBuffer));
-    vk::LineLoopHandler::Draw(drawCallParams.indexCount(), commandBuffer);
+    vk::LineLoopHelper::Draw(drawCallParams.indexCount(), commandBuffer);
 
     return gl::NoError();
 }