diff options
| author |  egdaniel <egdaniel@google.com> | 2016-08-15 08:06:29 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-15 08:06:29 -0700 |
| commit | a95d46b4ac8e41c9beb2b750cd389b1c6ebaf0a7 (patch) | |
| tree | 31ce237b1f3931a9ccdc4d41672d5762b58e8abe /src/gpu | |
| parent | ced26a3d6b77d3a6744a8ccb8eff23eda45fc867 (diff) | |
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
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrContext.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkCaps.h | 2 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkGpu.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index e238911f49..06c27ea2cf 100644 --- 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 576972110d..ca92e59cae 100644 --- 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 55fb533a53..f097aef26e 100644 --- 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(®ion, 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 }; |