diff options
| author |  jvanverth <jvanverth@google.com> | 2016-06-01 09:39:15 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-01 09:39:15 -0700 |
| commit | 1e305ba0d6a4237020d36234e9e286d3b0489401 (patch) | |
| tree | 703124336683add4f026ae699db8e079b357696c /tools | |
| parent | 4a603fc591dcd36b3cb47344c244ecbbbaf179f4 (diff) | |
Add offset to memory allocations
This is setting up for suballocations within one large
allocation
BUG=skia:5031
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2018933004
TBR=bsalomon@google.com
Review-Url: https://codereview.chromium.org/2018933004
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/viewer/Viewer.cpp | 4 | ||||
| -rw-r--r-- | tools/viewer/sk_app/VulkanWindowContext.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp index 9f3b8f2e27..5228a0fd12 100644 --- a/tools/viewer/Viewer.cpp +++ b/tools/viewer/Viewer.cpp @@ -255,7 +255,9 @@ void Viewer::setupCurrentSlide(int previousSlide) { const SkISize slideSize = fSlides[fCurrentSlide]->getDimensions(); SkRect windowRect = fWindow->getContentRect(); fDefaultMatrixInv.mapRect(&windowRect); - fGesture.setTransLimit(SkRect::MakeWH(slideSize.width(), slideSize.height()), windowRect); + fGesture.setTransLimit(SkRect::MakeWH(SkIntToScalar(slideSize.width()), + SkIntToScalar(slideSize.height())), + windowRect); } this->updateTitle(); diff --git a/tools/viewer/sk_app/VulkanWindowContext.cpp b/tools/viewer/sk_app/VulkanWindowContext.cpp index f192c697e8..84f0dfbf99 100644 --- a/tools/viewer/sk_app/VulkanWindowContext.cpp +++ b/tools/viewer/sk_app/VulkanWindowContext.cpp @@ -265,7 +265,7 @@ void VulkanWindowContext::createBuffers(VkFormat format) { GrBackendRenderTargetDesc desc; GrVkImageInfo info; info.fImage = fImages[i]; - info.fAlloc = VK_NULL_HANDLE; + info.fAlloc = { VK_NULL_HANDLE, 0 }; info.fImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; info.fImageTiling = VK_IMAGE_TILING_OPTIMAL; info.fFormat = format; |