commit fa5d84be414528212b9aaee23551c8dc1971ad38
author Luc Ferron <lucferron@chromium.org> Thu Jun 28 10:40:04 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Jun 28 19:22:36 2018 +0000
tree de07f986c5e10cc5d11d0f5fcbfde0b372956aa2
parent 475ef575c699b93a0d7ded448f16af1bc119b4ce

Vulkan: Fix offset handling for vertex buffers

Bug: angleproject:2580
Change-Id: I22f62a8549e998275224a6b1f9c133cf31ebb5b9
Reviewed-on: https://chromium-review.googlesource.com/1118419
Commit-Queue: Luc Ferron <lucferron@chromium.org>
Reviewed-by: Geoff Lang <geofflang@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 e319baf..d3bf299 100644
--- a/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
+++ b/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
@@ -244,14 +244,14 @@
             BufferVk *bufferVk                        = vk::GetImpl(bufferGL);
             mCurrentArrayBufferResources[attribIndex] = bufferVk;
             mCurrentArrayBufferHandles[attribIndex]   = bufferVk->getVkBuffer().getHandle();
+            mCurrentArrayBufferOffsets[attribIndex]   = binding.getOffset();
         }
         else
         {
             mCurrentArrayBufferResources[attribIndex] = nullptr;
             mCurrentArrayBufferHandles[attribIndex]   = VK_NULL_HANDLE;
+            mCurrentArrayBufferOffsets[attribIndex]   = 0;
         }
-        // TODO(jmadill): Offset handling.  Assume zero for now.
-        mCurrentArrayBufferOffsets[attribIndex] = 0;
     }
     else
     {
@@ -351,7 +351,7 @@
     vk::PackedVertexInputAttributeDesc &attribDesc = mPackedInputAttributes[attribIndex];
     attribDesc.format                              = static_cast<uint16_t>(vkFormat);
     attribDesc.location                            = static_cast<uint16_t>(attribIndex);
-    attribDesc.offset = static_cast<uint32_t>(ComputeVertexAttributeOffset(attrib, binding));
+    attribDesc.offset                              = static_cast<uint32_t>(attrib.relativeOffset);
 }
 
 gl::Error VertexArrayVk::drawArrays(const gl::Context *context,