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/FramebufferVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
index 9207252..0b72091 100644
--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
@@ -454,7 +454,7 @@
     size_t blitAllocationSize = copyFormat.pixelBytes * copyArea.width * copyArea.height;
     uint8_t *destPtr          = nullptr;
     VkBuffer destBufferHandle = VK_NULL_HANDLE;
-    uint32_t destOffset       = 0;
+    VkDeviceSize destOffset   = 0;
     ANGLE_TRY(mBlitPixelBuffer.allocate(contextVk, blitAllocationSize, &destPtr, &destBufferHandle,
                                         &destOffset, nullptr));
 
@@ -1165,7 +1165,7 @@
     VkBuffer bufferHandle    = VK_NULL_HANDLE;
     uint8_t *readPixelBuffer = nullptr;
     bool newBufferAllocated  = false;
-    uint32_t stagingOffset   = 0;
+    VkDeviceSize stagingOffset = 0;
     size_t allocationSize    = readFormat->pixelBytes * area.width * area.height;
 
     ANGLE_TRY(mReadPixelBuffer.allocate(contextVk, allocationSize, &readPixelBuffer, &bufferHandle,
@@ -1173,7 +1173,7 @@
 
     VkBufferImageCopy region;
     region.bufferImageHeight               = area.height;
-    region.bufferOffset                    = static_cast<VkDeviceSize>(stagingOffset);
+    region.bufferOffset                    = stagingOffset;
     region.bufferRowLength                 = area.width;
     region.imageExtent.width               = area.width;
     region.imageExtent.height              = area.height;