diff options
| author |  bsalomon <bsalomon@google.com> | 2015-01-31 20:10:56 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-31 20:10:56 -0800 |
| commit | e137db8569e7a10d809980609688b3acfaec612a (patch) | |
| tree | f2f41a49f6b250074d4a176c207cc9d64779ef57 /include/gpu/GrResourceKey.h | |
| parent | 8a4527e98a57b1d2dd248a635f0c4fa227be2089 (diff) | |
Revert of Move npot resizing out of GrContext and simplify GrContext texture functions. (patchset #10 id:200001 of https://codereview.chromium.org/882223003/)
Reason for revert:
perf fix didn't fix the cr webgl conformance tests
Original issue's description:
> Move npot resizing out of GrContext and simplify GrContext texture functions.
>
> Committed: https://skia.googlesource.com/skia/+/8a8100349105c8c6de39fcb34e47679da7a67f54
>
> Committed: https://skia.googlesource.com/skia/+/6c96672491b04cb782bce8fee778124df66524a0
TBR=robertphillips@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/887303002
Diffstat (limited to 'include/gpu/GrResourceKey.h')
| -rw-r--r-- | include/gpu/GrResourceKey.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/gpu/GrResourceKey.h b/include/gpu/GrResourceKey.h index e09a2c710f..4c76b68c2d 100644 --- a/include/gpu/GrResourceKey.h +++ b/include/gpu/GrResourceKey.h @@ -220,7 +220,6 @@ 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(); |