diff options
| author |  bsalomon <bsalomon@google.com> | 2014-11-11 08:29:01 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-11 08:29:01 -0800 |
| commit | 672550ddb6098ab39bb8b5c48d2dc08f00df4c6a (patch) | |
| tree | b4dce185f509d3be17e3cf62af83cff3fce31e2b /src/gpu | |
| parent | 1e4595a050790f65f1c53143c4a9a557df0767f4 (diff) | |
Remove bogus assert
content key can be set after pending io scheduled (e.g. when scaling up a npot texture to pot).
BUG=skia:2889
TBR=robertphillips@google.com
Review URL: https://codereview.chromium.org/693843004
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrGpuResource.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gpu/GrGpuResource.cpp b/src/gpu/GrGpuResource.cpp index 87c7349246..d4728452fb 100644 --- a/src/gpu/GrGpuResource.cpp +++ b/src/gpu/GrGpuResource.cpp @@ -80,10 +80,9 @@ GrContext* GrGpuResource::getContext() { } bool GrGpuResource::setContentKey(const GrResourceKey& contentKey) { - SkASSERT(!contentKey.isScratch()); // Currently this can only be called once and can't be called when the resource is scratch. + SkASSERT(!contentKey.isScratch()); SkASSERT(this->internalHasRef()); - SkASSERT(!this->internalHasPendingIO()); if (fContentKeySet) { return false; |