commit 4c3108319e4233f8e7140f274d25d565a0701f21
author Jamie Madill <jmadill@chromium.org> Wed Aug 29 13:43:17 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Wed Aug 29 18:24:03 2018 +0000
tree 710f045df53469cd23cdc977f9de3a554da17b00
parent 3e217f65044d6d6c6bca789231f9f7866f7ca1ed

Vulkan: Return VkDeviceSize from DynamicBuffer.

This obviates many static_casts. More closely represents what Vulkan
is doing. One cast remains where we are using uint32_t for dynamic
offsets with uniform buffers.

Bug: angleproject:2786
Change-Id: I043ebb5d965f46ee6ebbfcb91d75a58508cacfe3
Reviewed-on: https://chromium-review.googlesource.com/1188949
Reviewed-by: Frank Henigman <fjhenigman@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 fce9d98..f27f898 100644
--- a/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
+++ b/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
@@ -122,12 +122,10 @@
         const uint8_t *src = static_cast<const uint8_t *>(attrib.pointer) +
                              drawCallParams.firstVertex() * binding.getStride();
         uint8_t *dst    = nullptr;
-        uint32_t offset = 0;
         ANGLE_TRY(mDynamicVertexData.allocate(contextVk, bytesAllocated, &dst,
-                                              &mCurrentArrayBufferHandles[attribIndex], &offset,
-                                              nullptr));
+                                              &mCurrentArrayBufferHandles[attribIndex],
+                                              &mCurrentArrayBufferOffsets[attribIndex], nullptr));
         dst += drawCallParams.firstVertex() * mCurrentArrayBufferStrides[attribIndex];
-        mCurrentArrayBufferOffsets[attribIndex] = static_cast<VkDeviceSize>(offset);
         mCurrentArrayBufferFormats[attribIndex]->vertexLoadFunction(
             src, binding.getStride(), drawCallParams.vertexCount(), dst);
     }
@@ -142,13 +140,11 @@
 {
     ASSERT(!mState.getElementArrayBuffer().get());
 
-    uint32_t offset = 0;
-
     const GLsizei amount = sizeof(GLushort) * drawCallParams.indexCount();
     GLubyte *dst         = nullptr;
 
     ANGLE_TRY(mDynamicIndexData.allocate(contextVk, amount, &dst, &mCurrentElementArrayBufferHandle,
-                                         &offset, nullptr));
+                                         &mCurrentElementArrayBufferOffset, nullptr));
     if (drawCallParams.type() == GL_UNSIGNED_BYTE)
     {
         // Unsigned bytes don't have direct support in Vulkan so we have to expand the
@@ -166,7 +162,6 @@
     }
     ANGLE_TRY(mDynamicIndexData.flush(contextVk));
     mDynamicIndexData.releaseRetainedBuffers(contextVk->getRenderer());
-    mCurrentElementArrayBufferOffset = offset;
     return angle::Result::Continue();
 }
 
@@ -201,11 +196,10 @@
 
     void *src       = nullptr;
     uint8_t *dst    = nullptr;
-    uint32_t offset = 0;
 
     ANGLE_TRY(mCurrentArrayBufferConversion[attribIndex].allocate(
         context, numVertices * dstFormatSize, &dst, &mCurrentArrayBufferHandles[attribIndex],
-        &offset, nullptr));
+        &mCurrentArrayBufferOffsets[attribIndex], nullptr));
     ANGLE_TRY(srcBuffer->mapImpl(context, &src));
     mCurrentArrayBufferFormats[attribIndex]->vertexLoadFunction(
         static_cast<const uint8_t *>(src) + binding.getOffset(), binding.getStride(), numVertices,
@@ -214,7 +208,6 @@
     ANGLE_TRY(mCurrentArrayBufferConversion[attribIndex].flush(context));
 
     mCurrentArrayBufferConversionCanRelease[attribIndex] = true;
-    mCurrentArrayBufferOffsets[attribIndex]              = offset;
     mCurrentArrayBufferStrides[attribIndex]              = dstFormatSize;
 
     return angle::Result::Continue();
@@ -644,11 +637,10 @@
             // go from unsigned byte to unsigned short.
             uint8_t *allocatedData      = nullptr;
             bool newBufferAllocated     = false;
-            uint32_t expandedDataOffset = 0;
             ANGLE_TRY(mTranslatedByteIndexData.allocate(
                 contextVk, static_cast<size_t>(bufferVk->getSize()) * 2, &allocatedData,
-                &mCurrentElementArrayBufferHandle, &expandedDataOffset, &newBufferAllocated));
-            mCurrentElementArrayBufferOffset = static_cast<VkDeviceSize>(expandedDataOffset);
+                &mCurrentElementArrayBufferHandle, &mCurrentElementArrayBufferOffset,
+                &newBufferAllocated));
 
             // Expand the source into the destination
             ASSERT(!context->getGLState().isPrimitiveRestartEnabled());