From: Greg Daniel <egdaniel@google.com>
Date: Tue, 28 Mar 2017 18:00:32 +0000 (+0000)
Subject: Revert "Fix copy offset when uploading initial mip data in Vulkan"
X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~46^2~292
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2041e44c3d60af2868c5070a62d3f8ddf1fa8006;p=platform%2Fupstream%2FlibSkiaSharp.git

Revert "Fix copy offset when uploading initial mip data in Vulkan"

This reverts commit f6c360f7ce738411ba2d97f188e30aef0504dfc7.

Reason for revert: breaking write tests.
Original change's description:
> Fix copy offset when uploading initial mip data in Vulkan
>
> BUG=skia:
>
> Change-Id: Id25e5f39d1393b8dec325d85afb4bc22a11f6bda
> Reviewed-on: https://skia-review.googlesource.com/10283
> Commit-Queue: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Jim Van Verth <jvanverth@google.com>
>

TBR=egdaniel@google.com,jvanverth@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Change-Id: If7f9eccc7f1ba923393a14c5e11678610986faa6
Reviewed-on: https://skia-review.googlesource.com/10286
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
---

diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index 07fc0cb..7419f15 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -610,7 +610,7 @@ bool GrVkGpu::uploadTexDataOptimal(GrVkTexture* tex,
         region.bufferRowLength = currentWidth;
         region.bufferImageHeight = currentHeight;
         region.imageSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, SkToU32(currentMipLevel), 0, 1 };
-        region.imageOffset = { left, top, 0 };
+        region.imageOffset = { left, flipY ? tex->height() - top - currentHeight : top, 0 };
         region.imageExtent = { (uint32_t)currentWidth, (uint32_t)currentHeight, 1 };
 
         currentWidth = SkTMax(1, currentWidth/2);