diff options
| author |  Adrienne Walker <enne@chromium.org> | 2018-05-15 11:44:34 -0700 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-16 18:19:52 +0000 |
| commit | 3ed3399a932c8906d4c4a7fd1ef108ced30141d4 (patch) | |
| tree | a06a50985c7116c40551f81bf547ea6266ae5e81 /src/gpu/gl/GrGLGpu.cpp | |
| parent | 9fba557ad559f337b4ba3dcf5ab117cb68a3887a (diff) | |
Driver bug workaround: restore_scissor_on_fbo_change
Bug: chromium: 829614
Change-Id: I333aed9a378ab9b7aafaa96bb495378d1db4a61d
Reviewed-on: https://skia-review.googlesource.com/127118
Commit-Queue: Adrienne Walker <enne@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/gl/GrGLGpu.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 908d367fcd..d957eb3c8a 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -1353,6 +1353,7 @@ bool GrGLGpu::createRenderTargetObjects(const GrSurfaceDesc& desc, fGLContext->caps()->markConfigAsValidColorAttachment(desc.fConfig); } + this->didBindFramebuffer(); return true; FAILED: @@ -2475,6 +2476,7 @@ void GrGLGpu::flushRenderTargetNoColorWrites(GrGLRenderTarget* target, bool disa if (fHWBoundRenderTargetUniqueID != rtID) { fStats.incRenderTargetBinds(); GL_CALL(BindFramebuffer(GR_GL_FRAMEBUFFER, target->renderFBOID())); + this->didBindFramebuffer(); #ifdef SK_DEBUG // don't do this check in Chromium -- this is causing // lots of repeated command buffer flushes when the compositor is @@ -3379,6 +3381,7 @@ void GrGLGpu::bindSurfaceFBOForPixelOps(GrSurface* surface, GrGLenum fboTarget, GR_GL_CALL(this->glInterface(), BindFramebuffer(fboTarget, rt->renderFBOID())); *viewport = rt->getViewport(); } + this->didBindFramebuffer(); } void GrGLGpu::unbindTextureFBOForPixelOps(GrGLenum fboTarget, GrSurface* surface) { @@ -3394,6 +3397,19 @@ void GrGLGpu::unbindTextureFBOForPixelOps(GrGLenum fboTarget, GrSurface* surface } } +void GrGLGpu::didBindFramebuffer() { + if (!this->caps()->workarounds().restore_scissor_on_fbo_change) { + return; + } + + // The driver forgets the correct scissor when modifying the FBO binding. + fHWScissorSettings.fRect.pushToGLScissor(this->glInterface()); + + // crbug.com/222018 - Also on QualComm, the flush here avoids flicker, + // it's unclear how this bug works. + GL_CALL(Flush()); +} + bool GrGLGpu::onCopySurface(GrSurface* dst, GrSurfaceOrigin dstOrigin, GrSurface* src, GrSurfaceOrigin srcOrigin, const SkIRect& srcRect, const SkIPoint& dstPoint, |