diff options
author | csmartdalton <csmartdalton@google.com> | 2016-11-15 14:26:27 -0700 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-16 00:04:43 +0000 |
commit | dabc91bc0f42a9484b6025ddc68fa958455fb53c (patch) | |
tree | c71be2f4f9d5530618439a160a35811316965363 | |
parent | 44e91c9638e7e31966d304635682e819cd9e440a (diff) |
Fix flushing of HWAA state relating to mixed samples
Fixes the sense of the "stencilEnabled" argument sent to
flushHWAAState.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4872
Change-Id: If7097f2819607864c95b0ffd04dc1d302fa66fdc
Reviewed-on: https://skia-review.googlesource.com/4872
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
-rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 3e98cab9d0..ad5fcf79f3 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -2064,7 +2064,7 @@ bool GrGLGpu::flushGLState(const GrPipeline& pipeline, const GrPrimitiveProcesso this->flushStencil(stencil); this->flushScissor(pipeline.getScissorState(), glRT->getViewport(), glRT->origin()); this->flushWindowRectangles(pipeline.getWindowRectsState(), glRT); - this->flushHWAAState(glRT, pipeline.isHWAntialiasState(), stencil.isDisabled()); + this->flushHWAAState(glRT, pipeline.isHWAntialiasState(), !stencil.isDisabled()); // This must come after textures are flushed because a texture may need // to be msaa-resolved (which will modify bound FBO state). |