diff options
| author |  robertphillips <robertphillips@google.com> | 2014-07-20 09:21:02 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-20 09:21:02 -0700 |
| commit | 249171e7d29b5559f3eefe9dbd437030bfad3fda (patch) | |
| tree | 86dc25e2eb7188b8b3f30721bebd388046870cb5 /src/gpu/GrBitmapTextContext.cpp | |
| parent | f568f6a557dbc5a6b2f99b3747340ff7d36da26b (diff) | |
Revert of Use the GrCacheable ID to eliminate the need for notifications to GrGpuGL when textures and RTs are… (https://codereview.chromium.org/376703009/)
Reason for revert:
Trying to unblock roll wedged on 64 bit intrinsic call on XP
Original issue's description:
> Use the GrCacheable ID to eliminate the need for notifications to GrGpuGL when textures and RTs are deleted.
>
> Also, rename GrCacheable::getGenerationID() to getInstanceID() since it doesn't behave like other "generation" IDs.
>
> Committed: https://skia.googlesource.com/skia/+/91bdbcdbbdf5cdf0fdb4518a0d30206c964cfdf6
R=jvanverth@google.com, bsalomon@google.com
TBR=bsalomon@google.com, jvanverth@google.com
NOTREECHECKS=true
NOTRY=true
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/405023003
Diffstat (limited to 'src/gpu/GrBitmapTextContext.cpp')
| -rwxr-xr-x | src/gpu/GrBitmapTextContext.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/GrBitmapTextContext.cpp b/src/gpu/GrBitmapTextContext.cpp index 78b6174b29..25c13ec8d1 100755 --- a/src/gpu/GrBitmapTextContext.cpp +++ b/src/gpu/GrBitmapTextContext.cpp @@ -56,7 +56,7 @@ GrBitmapTextContext::GrBitmapTextContext(GrContext* context, fCurrTexture = NULL; fCurrVertex = 0; - fEffectTextureInstanceID = 0; + fEffectTextureGenID = 0; fVertices = NULL; fMaxVertices = 0; @@ -94,11 +94,11 @@ void GrBitmapTextContext::flushGlyphs() { SkASSERT(fCurrTexture); GrTextureParams params(SkShader::kRepeat_TileMode, GrTextureParams::kNone_FilterMode); - uint64_t textureInstanceID = fCurrTexture->getInstanceID(); + uint32_t textureGenID = fCurrTexture->getGenerationID(); - if (textureInstanceID != fEffectTextureInstanceID) { + if (textureGenID != fEffectTextureGenID) { fCachedEffect.reset(GrCustomCoordsTextureEffect::Create(fCurrTexture, params)); - fEffectTextureInstanceID = textureInstanceID; + fEffectTextureGenID = textureGenID; } // This effect could be stored with one of the cache objects (atlas?) |