diff options
| author |  csmartdalton <csmartdalton@google.com> | 2017-02-22 23:16:23 -0700 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-23 17:35:12 +0000 |
| commit | 372953bac3fd4b48925b32b995b97e614e2f4bed (patch) | |
| tree | 7e114bb31d86c16124054dcebc6fba1c71f64576 /src | |
| parent | 16a40cb65adeb4d94b84479f9946c360ed73e1bb (diff) | |
Don't use mixed samples if NVPR is disabled
BUG=skia:
Change-Id: I48c72268e30e202a101177393eb777f18a11cb6f
Reviewed-on: https://skia-review.googlesource.com/8790
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 370fb0713b..ddf225213e 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -356,10 +356,12 @@ void GrGLCaps::init(const GrContextOptions& contextOptions, **************************************************************************/ // We need dual source blending and the ability to disable multisample in order to support mixed - // samples in every corner case. + // samples in every corner case. We only use mixed samples if the stencil-and-cover path + // renderer is available and enabled; no other path renderers support this feature. if (fMultisampleDisableSupport && shaderCaps->dualSourceBlendingSupport() && - fShaderCaps->pathRenderingSupport()) { + fShaderCaps->pathRenderingSupport() && + (contextOptions.fGpuPathRenderers & GrContextOptions::GpuPathRenderers::kStencilAndCover)) { fUsesMixedSamples = ctxInfo.hasExtension("GL_NV_framebuffer_mixed_samples") || ctxInfo.hasExtension("GL_CHROMIUM_framebuffer_mixed_samples"); // Workaround NVIDIA bug related to glInvalidateFramebuffer and mixed samples. |