Revert "Further centralize computation of GrSurface VRAM consumption"
authorBen Wagner <benjaminwagner@google.com>
Sun, 6 Nov 2016 12:33:22 +0000 (12:33 +0000)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Sun, 6 Nov 2016 12:47:22 +0000 (12:47 +0000)
commit9c46b68d5340efc91368cef1cc5775f13c97cab8
tree5185d315cb799a8c51b41c3067b9022b4effeb3a
parentce4d04ae8eace6ba53ff8b8c8d8f4a2e6af4e59f
Revert "Further centralize computation of GrSurface VRAM consumption"

This reverts commit ccd3c8937fce4bb28df19533ed043cad209e277d.

Reason for revert: Blocking Chromium roll: https://codereview.chromium.org/2482643002/

Original change's description:
> 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 <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
>

TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=662630

Change-Id: I186db2a41eb2bd789e6f681b3547e32d9ca374cf
Reviewed-on: https://skia-review.googlesource.com/4443
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
19 files changed:
include/core/SkSurface.h
include/gpu/GrRenderTarget.h
include/gpu/GrSurface.h
include/gpu/GrTexture.h
src/gpu/GrRenderTarget.cpp
src/gpu/GrRenderTargetProxy.cpp
src/gpu/GrSurface.cpp
src/gpu/GrTexture.cpp
src/gpu/GrTextureProxy.cpp
src/gpu/gl/GrGLGpu.cpp
src/gpu/gl/GrGLRenderTarget.cpp
src/gpu/gl/GrGLRenderTarget.h
src/gpu/gl/GrGLTexture.cpp
src/gpu/gl/GrGLTexture.h
src/gpu/gl/GrGLTextureRenderTarget.cpp
src/gpu/gl/GrGLTextureRenderTarget.h
src/gpu/vk/GrVkRenderTarget.h
src/gpu/vk/GrVkTextureRenderTarget.h
tests/ResourceCacheTest.cpp