diff options
| author |  fmalita <fmalita@chromium.org> | 2015-01-31 07:02:18 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-31 07:02:18 -0800 |
| commit | 6bfef2dfec3253efa48aec0b5ea108e0dc041d15 (patch) | |
| tree | 7402cf0046bfa6077cb3e732e57e63f2f7927f63 /include/gpu/GrResourceKey.h | |
| parent | 6726e78cd971e7dce42f8b5904284f744f55cb36 (diff) | |
Revert of Move npot resizing out of GrContext and simplify GrContext texture functions. (patchset #9 id:160001 of https://codereview.chromium.org/882223003/)
Reason for revert:
webGL conformance failures:
WebglConformance.conformance_textures_tex_image_and_sub_image_2d_with_video
WebglConformance.conformance_textures_texture_npot_video
https://codereview.chromium.org/892773003/
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_ng/builds/29272
Original issue's description:
> Move npot resizing out of GrContext and simplify GrContext texture functions.
>
> Committed: https://skia.googlesource.com/skia/+/8a8100349105c8c6de39fcb34e47679da7a67f54
TBR=robertphillips@google.com,bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/868233005
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(); |