When setting up a copySurface dst texture make the orientation match the src when glBlitFramebuffer requires it

BUG=chromium:618122
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2049753002

Review-Url: https://codereview.chromium.org/2049753002
This commit is contained in:
bsalomon 2016-06-08 10:02:42 -07:00 committed by Commit bot
parent e8bd9abe33
commit 5c7d62d431

View File

@ -3575,13 +3575,19 @@ bool GrGLGpu::initCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc)
// 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.
GrSurfaceOrigin originForBlitFramebuffer = kDefault_GrSurfaceOrigin;
if (this->glCaps().blitFramebufferSupport() ==
GrGLCaps::kNoScalingNoMirroring_BlitFramebufferSupport) {
originForBlitFramebuffer = src->origin();
}
// 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. 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->fOrigin = originForBlitFramebuffer;
desc->fFlags = kRenderTarget_GrSurfaceFlag;
desc->fConfig = kBGRA_8888_GrPixelConfig;
return true;
@ -3597,7 +3603,7 @@ bool GrGLGpu::initCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc)
// 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->fOrigin = originForBlitFramebuffer;
desc->fFlags = kRenderTarget_GrSurfaceFlag;
desc->fConfig = src->config();
return true;