diff options
author | 2014-11-26 08:45:30 -0800 | |
---|---|---|
committer | 2014-11-26 08:45:30 -0800 | |
commit | e9aa5dc4d5906788eaf691d7c69f1494928f401d (patch) | |
tree | c645e1b5fc2fbc766ad08c32462dd11279d49db0 /src/gpu/gl | |
parent | 1dbd816ea6fa5027c922c1df3a09889baed3a31b (diff) |
some cleanup around GrGpu/GrDrawTarget copySurface
Review URL: https://codereview.chromium.org/749903003
Diffstat (limited to 'src/gpu/gl')
-rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 50 | ||||
-rw-r--r-- | src/gpu/gl/GrGpuGL.h | 19 |
2 files changed, 42 insertions, 27 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index 8bf35c1690..d56566379d 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -2362,30 +2362,46 @@ GrGLuint GrGpuGL::bindSurfaceAsFBO(GrSurface* surface, GrGLenum fboTarget, GrGLI return tempFBOID; } -void GrGpuGL::initCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc) { +bool GrGpuGL::initCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc) { + // In here we look for opportunities to use CopyTexSubImage, or fbo blit. If neither are + // possible and we return false to fallback to creating a render target dst for render-to- + // texture. This code prefers CopyTexSubImage to fbo blit and avoids triggering temporary fbo + // creation. It isn't clear that avoiding temporary fbo creation is actually optimal. + // Check for format issues with glCopyTexSubImage2D if (kGLES_GrGLStandard == this->glStandard() && this->glCaps().bgraIsInternalFormat() && kBGRA_8888_GrPixelConfig == src->config()) { - // glCopyTexSubImage2D doesn't work with this config. We'll want to make it a render target - // in order to call glBlitFramebuffer or to copy to it by rendering. - INHERITED::initCopySurfaceDstDesc(src, desc); - return; + // glCopyTexSubImage2D doesn't work with this config. If the bgra can be used with fbo blit + // then we set up for that, otherwise fail. + if (this->caps()->isConfigRenderable(kBGRA_8888_GrPixelConfig, false)) { + desc->fOrigin = kDefault_GrSurfaceOrigin; + desc->fFlags = kRenderTarget_GrSurfaceFlag | kNoStencil_GrSurfaceFlag; + desc->fConfig = kBGRA_8888_GrPixelConfig; + return true; + } + return false; } else if (NULL == src->asRenderTarget()) { - // We don't want to have to create an FBO just to use glCopyTexSubImage2D. Let the base - // class handle it by rendering. - INHERITED::initCopySurfaceDstDesc(src, desc); - return; + // CopyTexSubImage2D or fbo blit would require creating a temp fbo for the src. + return false; } const GrGLRenderTarget* srcRT = static_cast<const GrGLRenderTarget*>(src->asRenderTarget()); if (srcRT && srcRT->renderFBOID() != srcRT->textureFBOID()) { - // It's illegal to call CopyTexSubImage2D on a MSAA renderbuffer. - INHERITED::initCopySurfaceDstDesc(src, desc); - } else { - desc->fConfig = src->config(); - desc->fOrigin = src->origin(); - desc->fFlags = kNone_GrSurfaceFlags; + // It's illegal to call CopyTexSubImage2D on a MSAA renderbuffer. Set up for FBO blit or + // fail. + if (this->caps()->isConfigRenderable(src->config(), false)) { + desc->fOrigin = kDefault_GrSurfaceOrigin; + desc->fFlags = kRenderTarget_GrSurfaceFlag | kNoStencil_GrSurfaceFlag; + desc->fConfig = src->config(); + } + return false; } + + // We'll do a CopyTexSubImage. Make the dst a plain old texture. + desc->fConfig = src->config(); + desc->fOrigin = src->origin(); + desc->fFlags = kNone_GrSurfaceFlags; + return true; } bool GrGpuGL::copySurface(GrSurface* dst, @@ -2496,8 +2512,8 @@ bool GrGpuGL::canCopySurface(const GrSurface* dst, const SkIRect& srcRect, const SkIPoint& dstPoint) { // This mirrors the logic in onCopySurface. We prefer our base makes the copy if we need to - // create a temp fbo - // TODO verify this assumption, it may not be true at all + // create a temp fbo. TODO verify the assumption that temp fbos are expensive; it may not be + // true at all. bool wouldNeedTempFBO = false; if (can_copy_texsubimage(dst, src, this, &wouldNeedTempFBO) && !wouldNeedTempFBO) { return true; diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h index a176c95bca..4224ba64fd 100644 --- a/src/gpu/gl/GrGpuGL.h +++ b/src/gpu/gl/GrGpuGL.h @@ -68,7 +68,7 @@ public: size_t rowBytes) const SK_OVERRIDE; virtual bool fullReadPixelsIsFasterThanPartial() const SK_OVERRIDE; - virtual void initCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc) SK_OVERRIDE; + virtual bool initCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc) SK_OVERRIDE; // These functions should be used to bind GL objects. They track the GL state and skip redundant // bindings. Making the equivalent glBind calls directly will confuse the state tracking. @@ -94,16 +94,15 @@ public: fHWGeometryState.notifyIndexBufferDelete(id); } - // DrawTarget overrides - virtual bool copySurface(GrSurface* dst, - GrSurface* src, - const SkIRect& srcRect, - const SkIPoint& dstPoint) SK_OVERRIDE; + bool copySurface(GrSurface* dst, + GrSurface* src, + const SkIRect& srcRect, + const SkIPoint& dstPoint) SK_OVERRIDE; - virtual bool canCopySurface(const GrSurface* dst, - const GrSurface* src, - const SkIRect& srcRect, - const SkIPoint& dstPoint) SK_OVERRIDE; + bool canCopySurface(const GrSurface* dst, + const GrSurface* src, + const SkIRect& srcRect, + const SkIPoint& dstPoint) SK_OVERRIDE; protected: virtual void buildProgramDesc(const GrOptDrawState&, |