diff options
author | bsalomon <bsalomon@google.com> | 2015-01-31 19:27:53 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-31 19:27:53 -0800 |
commit | 6c96672491b04cb782bce8fee778124df66524a0 (patch) | |
tree | 49407e533766dad8d3fae3c5794afc4536a79098 /include/gpu/GrResourceKey.h | |
parent | 0b737c52a7b8bc6ba41d309e88b3f7e995746f8d (diff) |
Move npot resizing out of GrContext and simplify GrContext texture functions.
Committed: https://skia.googlesource.com/skia/+/8a8100349105c8c6de39fcb34e47679da7a67f54
Review URL: https://codereview.chromium.org/882223003
Diffstat (limited to 'include/gpu/GrResourceKey.h')
-rw-r--r-- | include/gpu/GrResourceKey.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/gpu/GrResourceKey.h b/include/gpu/GrResourceKey.h index 4c76b68c2d..e09a2c710f 100644 --- a/include/gpu/GrResourceKey.h +++ b/include/gpu/GrResourceKey.h @@ -220,6 +220,7 @@ public: Builder(GrContentKey* key, const GrContentKey& innerKey, Domain domain, int extraData32Cnt) : INHERITED::Builder(key, domain, Data32CntForInnerKey(innerKey) + extraData32Cnt) { + SkASSERT(&innerKey != key); // add the inner key to the end of the key so that op[] can be indexed normally. uint32_t* innerKeyData = &this->operator[](extraData32Cnt); const uint32_t* srcData = innerKey.data(); |