Fix copying of data in vulkan testing texture

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2248703002

Review-Url: https://codereview.chromium.org/2248703002

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index e238911..06c27ea 100644 (file)
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -655,7 +655,7 @@ sk_sp<GrDrawContext> GrContextPriv::makeBackendRenderTargetDrawContext(
 }
 
 sk_sp<GrDrawContext> GrContextPriv::makeBackendTextureAsRenderTargetDrawContext(
-                                                     const GrBackendTextureDesc& desc, 
+                                                     const GrBackendTextureDesc& desc,
                                                      sk_sp<SkColorSpace> colorSpace,
                                                      const SkSurfaceProps* surfaceProps) {
     ASSERT_SINGLE_OWNER_PRIV

diff --git a/src/gpu/vk/GrVkCaps.h b/src/gpu/vk/GrVkCaps.h
index 5769721..ca92e59 100644 (file)
--- a/src/gpu/vk/GrVkCaps.h
+++ b/src/gpu/vk/GrVkCaps.h
@@ -37,7 +37,7 @@ public:
         return SkToBool(ConfigInfo::kRenderable_Flag & fConfigTable[config].fOptimalFlags);
     }
 
-    bool isConfigTexurableLinearly(GrPixelConfig config) const {
+    bool isConfigTexturableLinearly(GrPixelConfig config) const {
         return SkToBool(ConfigInfo::kTextureable_Flag & fConfigTable[config].fLinearFlags);
     }
 

diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index 55fb533..f097aef 100644 (file)
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -638,7 +638,7 @@ GrTexture* GrVkGpu::onCreateTexture(const GrSurfaceDesc& desc, SkBudgeted budget
             SkDebugf("Trying to create linear tiled texture with mipmap");
             return nullptr;
         }
-        if (fVkCaps->isConfigTexurableLinearly(desc.fConfig) &&
+        if (fVkCaps->isConfigTexturableLinearly(desc.fConfig) &&
             (!renderTarget || fVkCaps->isConfigRenderableLinearly(desc.fConfig, false))) {
             linearTiling = true;
         } else {
@@ -992,7 +992,7 @@ GrBackendObject GrVkGpu::createTestingOnlyBackendTexture(void* srcData, int w, i
         return 0;
     }
 
-    if (fVkCaps->isConfigTexurableLinearly(config) &&
+    if (fVkCaps->isConfigTexturableLinearly(config) &&
         (!isRenderTarget || fVkCaps->isConfigRenderableLinearly(config, false))) {
         linearTiling = true;
     }
@@ -1175,7 +1175,7 @@ GrBackendObject GrVkGpu::createTestingOnlyBackendTexture(void* srcData, int w, i
             VkBufferImageCopy region;
             memset(&region, 0, sizeof(VkBufferImageCopy));
             region.bufferOffset = 0;
-            region.bufferRowLength = (uint32_t)rowCopyBytes;
+            region.bufferRowLength = w;
             region.bufferImageHeight = h;
             region.imageSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 };
             region.imageOffset = { 0, 0, 0 };

diff --git a/tests/VkUploadPixelsTests.cpp b/tests/VkUploadPixelsTests.cpp
index 7f00ad2..8b6a56b 100644 (file)
--- a/tests/VkUploadPixelsTests.cpp
+++ b/tests/VkUploadPixelsTests.cpp
@@ -66,7 +66,7 @@ void basic_texture_test(skiatest::Reporter* reporter, GrContext* context, GrPixe
     // the expectation is that the given config is texturable/renderable with optimal tiling
     // but may not be with linear tiling
     if (linearTiling) {
-        if (!caps->isConfigTexurableLinearly(config) ||
+        if (!caps->isConfigTexturableLinearly(config) ||
             (renderTarget && !caps->isConfigRenderableLinearly(config, false))) {
             canCreate = false;
         }