From 05dceabf3422b785b52439378aa5527c42c6ca18 Mon Sep 17 00:00:00 2001 From: egdaniel Date: Wed, 22 Jun 2016 07:45:50 -0700 Subject: [PATCH] Use single alloc for vulkan optimal image heaps to fix memory crash BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2087283002 Review-Url: https://codereview.chromium.org/2087283002 --- src/gpu/vk/GrVkGpu.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp index b808354..05aa1de 100644 --- a/src/gpu/vk/GrVkGpu.cpp +++ b/src/gpu/vk/GrVkGpu.cpp @@ -135,7 +135,10 @@ GrVkGpu::GrVkGpu(GrContext* context, const GrContextOptions& options, // set up our heaps fHeaps[kLinearImage_Heap].reset(new GrVkHeap(this, GrVkHeap::kSubAlloc_Strategy, 16*1024*1024)); - fHeaps[kOptimalImage_Heap].reset(new GrVkHeap(this, GrVkHeap::kSubAlloc_Strategy, 64*1024*1024)); + // We want the OptimalImage_Heap to use a SubAlloc_strategy but it occasionally causes the + // device to run out of memory. Most likely this is caused by fragmentation in the device heap + // and we can't allocate more. Until we get a fix moving this to SingleAlloc. + fHeaps[kOptimalImage_Heap].reset(new GrVkHeap(this, GrVkHeap::kSingleAlloc_Strategy, 64*1024*1024)); fHeaps[kSmallOptimalImage_Heap].reset(new GrVkHeap(this, GrVkHeap::kSubAlloc_Strategy, 2*1024*1024)); fHeaps[kVertexBuffer_Heap].reset(new GrVkHeap(this, GrVkHeap::kSingleAlloc_Strategy, 0)); fHeaps[kIndexBuffer_Heap].reset(new GrVkHeap(this, GrVkHeap::kSingleAlloc_Strategy, 0)); -- 2.7.4