aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/gpu/GrResourceKey.h
diff options
context:
space:
mode:
authorGravatar egdaniel <egdaniel@google.com>2015-10-16 13:59:14 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-10-16 13:59:14 -0700
commit91957941ce2fe9457babe7f83514e4599089d411 (patch)
tree5a81c0bfe1494b59b260371b137567368594b62e /include/gpu/GrResourceKey.h
parentfcffaf22d697f06f903c3193308f9dc54a959f79 (diff)
Revert of Rewrite GrTextureMaker to disentangle bitmap case from base class and give GPU object a say in what… (patchset #4 id:60001 of https://codereview.chromium.org/1409163002/ )
Reason for revert: breaking nanobench Original issue's description: > Rewrite GrTextureMaker to disentangle bitmap case from base class and give GPU object a say in what copying needs to be done. > > Committed: https://skia.googlesource.com/skia/+/fcffaf22d697f06f903c3193308f9dc54a959f79 TBR=reed@google.com,bsalomon@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1409923003
Diffstat (limited to 'include/gpu/GrResourceKey.h')
-rw-r--r--include/gpu/GrResourceKey.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gpu/GrResourceKey.h b/include/gpu/GrResourceKey.h
index 9958cfc872..6cfa90fd8a 100644
--- a/include/gpu/GrResourceKey.h
+++ b/include/gpu/GrResourceKey.h
@@ -138,8 +138,8 @@ private:
friend class TestResource; // For unit test to access kMetaDataCnt.
- // bmp textures require 5 uint32_t values.
- SkAutoSTMalloc<kMetaDataCnt + 5, uint32_t> fKey;
+ // bmp textures require 4 uint32_t values.
+ SkAutoSTMalloc<kMetaDataCnt + 4, uint32_t> fKey;
};
/**