diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-07-30 13:13:17 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-30 19:32:13 +0000 |
| commit | 7226c232d73356a37ec8cfef0ed55147e68dd2fd (patch) | |
| tree | 47559e4a5994b5cffc5382e9bb230f49b6c04cd7 /src/gpu/gl/GrGLCaps.cpp | |
| parent | 3ebd354730ea9590bf233deccfc24982ffe48a98 (diff) | |
Make GrTextureProxy store a GrTextureType.
Removes flag indicating rectangle or external as its now redundant.
Bug: skia:
Change-Id: Ia475b557390e7a6b0f19f6e189cf8c27090e397c
Reviewed-on: https://skia-review.googlesource.com/144346
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/gl/GrGLCaps.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 5532e36bd0..0fc88437b0 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -2185,8 +2185,8 @@ bool GrGLCaps::canCopySurface(const GrSurfaceProxy* dst, const GrSurfaceProxy* s const GrTextureProxy* dstTex = dst->asTextureProxy(); const GrTextureProxy* srcTex = src->asTextureProxy(); - bool dstIsTex2D = dstTex ? dstTex->texPriv().isGLTexture2D() : false; - bool srcIsTex2D = srcTex ? srcTex->texPriv().isGLTexture2D() : false; + bool dstIsTex2D = dstTex ? (dstTex->texPriv().textureType() == GrTextureType::k2D) : false; + bool srcIsTex2D = srcTex ? (srcTex->texPriv().textureType() == GrTextureType::k2D) : false; // One of the possible requirements for copy as blit is that the srcRect must match the bounds // of the src surface. If we have a approx fit surface we can't know for sure what the src |