diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-05-29 12:37:20 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-29 17:04:51 +0000 |
| commit | 9bee2e5894bb8dd374392f238bc429e16f239583 (patch) | |
| tree | 975ace2218b6911b62c9c9abceb2545cba9e5150 /src/gpu/effects/GrBitmapTextGeoProc.cpp | |
| parent | 761717146923163991aeb32d50f05a2bdf471dc4 (diff) | |
Revise system for checking for uninstantiated proxies
The new pattern is:
we will "instantiate" pipelines at flush time
at flush time we will only access the backing GrSurface by peeking
If instantiation fails we should never try to access the GrSurfaces
Change-Id: I87f7ff41bd0e84d9ca3dbdd61d3361d3d4ceefd6
Reviewed-on: https://skia-review.googlesource.com/17932
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/effects/GrBitmapTextGeoProc.cpp')
| -rw-r--r-- | src/gpu/effects/GrBitmapTextGeoProc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index cd2fe563d1..93b4a0f836 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -31,7 +31,7 @@ public: // compute numbers to be hardcoded to convert texture coordinates from int to float SkASSERT(cte.numTextureSamplers() == 1); - SkDEBUGCODE(GrTexture* atlas = cte.textureSampler(0).texture()); + SkDEBUGCODE(GrTexture* atlas = cte.textureSampler(0).peekTexture()); SkASSERT(atlas && SkIsPow2(atlas->width()) && SkIsPow2(atlas->height())); GrGLSLVertToFrag v(kVec2f_GrSLType); |