Vulkan: Use automatic row length and image height for texture copies.

CopyTextureChromium sometimes failed because of incorrect image dimensions being used in the image copy command. Simply use 0, the images are all tightly packed. BUG=angleproject:2723 Change-Id: I2332561bdc9ee70ba07101bcf2db7ea9f2355844 Reviewed-on: https://chromium-review.googlesource.com/1194907 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Vulkan: Use automatic row length and image height for texture copies.
95bba6e5 · Geoff Lang · Commit Bot · a883dd06 · 95bba6e5
Commit 95bba6e5 authored Aug 29, 2018 by Geoff Lang Committed by Commit Bot Sep 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

TextureVk.cpp src/libANGLE/renderer/vulkan/TextureVk.cpp +2 -4

No files found.
--- a/src/libANGLE/renderer/vulkan/TextureVk.cpp
+++ b/src/libANGLE/renderer/vulkan/TextureVk.cpp
@@ -772,8 +772,6 @@ angle::Result TextureVk::copyImageDataToBuffer(ContextVk *contextVk,
    ANGLE_TRY(ensureImageInitialized(contextVk));

    const angle::Format &angleFormat = getImage().getFormat().textureFormat();
-    const gl::Extents imageSize =
-        mState.getImageDesc(NonCubeTextureTypeToTarget(mState.getType()), sourceLevel).size;
    size_t sourceCopyAllocationSize = sourceArea.width * sourceArea.height * angleFormat.pixelBytes;

    vk::CommandBuffer *commandBuffer = nullptr;
@@ -794,8 +792,8 @@ angle::Result TextureVk::copyImageDataToBuffer(ContextVk *contextVk,

    VkBufferImageCopy region;
    region.bufferOffset                    = sourceCopyOffset;
-    region.bufferRowLength                 = imageSize.width;
-    region.bufferImageHeight               = imageSize.height;
+    region.bufferRowLength                 = 0;
+    region.bufferImageHeight               = 0;
    region.imageExtent.width               = sourceArea.width;
    region.imageExtent.height              = sourceArea.height;
    region.imageExtent.depth               = 1;