From ccd3c8937fce4bb28df19533ed043cad209e277d Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Fri, 4 Nov 2016 10:23:43 -0400 Subject: Further centralize computation of GrSurface VRAM consumption GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4383 Change-Id: I054b74f2cd15f904f8e05af0fda58d6e8a523eb9 Reviewed-on: https://skia-review.googlesource.com/4383 Commit-Queue: Robert Phillips Reviewed-by: Brian Salomon --- src/gpu/vk/GrVkTextureRenderTarget.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/gpu/vk/GrVkTextureRenderTarget.h') diff --git a/src/gpu/vk/GrVkTextureRenderTarget.h b/src/gpu/vk/GrVkTextureRenderTarget.h index daa168758d..2877a36265 100644 --- a/src/gpu/vk/GrVkTextureRenderTarget.h +++ b/src/gpu/vk/GrVkTextureRenderTarget.h @@ -13,6 +13,8 @@ #include "GrVkRenderTarget.h" #include "GrVkGpu.h" +#include "GrTexturePriv.h" + #ifdef SK_BUILD_FOR_WIN // Windows gives bogus warnings about inheriting asTexture/asRenderTarget via dominance. #pragma warning(push) @@ -112,7 +114,9 @@ private: // GrGLRenderTarget accounts for the texture's memory and any MSAA renderbuffer's memory. size_t onGpuMemorySize() const override { - return GrVkRenderTarget::onGpuMemorySize(); + // The plus 1 is to account for the resolve texture. + return GrSurface::ComputeSize(fDesc, fDesc.fSampleCnt+1, // TODO: this still correct? + this->texturePriv().hasMipMaps()); } }; -- cgit v1.2.3