summaryrefslogtreecommitdiff
path: root/gpu/GrRenderTarget.cpp
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-05-14 12:13:15 +0100
committerTorne (Richard Coles) <torne@google.com>2014-05-14 12:13:15 +0100
commit6b0bad3aba066dc8d7d47a5f6738ebf773ffc2e9 (patch)
treead988be7ad87928b7b98c44f2def4cce7d3330b6 /gpu/GrRenderTarget.cpp
parent27ab20dffff01006f5d20fdb2b3f4ea503d69114 (diff)
parentd60f7edf0fa7eb2eb7c99de486abfe61ad3dcd69 (diff)
downloadsrc-6b0bad3aba066dc8d7d47a5f6738ebf773ffc2e9.tar.gz
Merge from Chromium at DEPS revision 269336HEADmastermain
This commit was generated by merge_to_master.py. Change-Id: I9d3335dcb08fc53d18bec993b89047b409bd7eb1
Diffstat (limited to 'gpu/GrRenderTarget.cpp')
-rw-r--r--gpu/GrRenderTarget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/gpu/GrRenderTarget.cpp b/gpu/GrRenderTarget.cpp
index 9348dc16..13fc2290 100644
--- a/gpu/GrRenderTarget.cpp
+++ b/gpu/GrRenderTarget.cpp
@@ -63,7 +63,7 @@ void GrRenderTarget::discard() {
context->discardRenderTarget(this);
}
-size_t GrRenderTarget::sizeInBytes() const {
+size_t GrRenderTarget::gpuMemorySize() const {
size_t colorBits;
if (kUnknown_GrPixelConfig == fDesc.fConfig) {
colorBits = 32; // don't know, make a guess