Prefer kMixedSamples MSFBOType to multisampled-render-to-texture variants
Bug: skia:7667 Change-Id: Ib5eef15ed1a2da5caf9d8be188b28341ab4d514b Reviewed-on: https://skia-review.googlesource.com/112720 Reviewed-by: Kimmo Kinnunen FI <kkinnunen@nvidia.com> Reviewed-by: Chris Dalton <csmartdalton@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
This commit is contained in:
parent
461ef7af88
commit
25d07fc354
@ -941,14 +941,15 @@ void GrGLCaps::initFSAASupport(const GrContextOptions& contextOptions, const GrG
|
|||||||
// it is part of the spec. Thus alpha8 will not be renderable for those devices.
|
// it is part of the spec. Thus alpha8 will not be renderable for those devices.
|
||||||
fAlpha8IsRenderable = true;
|
fAlpha8IsRenderable = true;
|
||||||
}
|
}
|
||||||
// We prefer the EXT/IMG extension over ES3 MSAA because we've observed
|
// We prefer multisampled-render-to-texture extensions over ES3 MSAA because we've observed
|
||||||
// ES3 driver bugs on at least one device with a tiled GPU (N10).
|
// ES3 driver bugs on at least one device with a tiled GPU (N10). However, if we're using
|
||||||
if (ctxInfo.hasExtension("GL_EXT_multisampled_render_to_texture")) {
|
// mixed samples we can't use multisampled-render-to-texture.
|
||||||
|
if (fUsesMixedSamples) {
|
||||||
|
fMSFBOType = kMixedSamples_MSFBOType;
|
||||||
|
} else if (ctxInfo.hasExtension("GL_EXT_multisampled_render_to_texture")) {
|
||||||
fMSFBOType = kES_EXT_MsToTexture_MSFBOType;
|
fMSFBOType = kES_EXT_MsToTexture_MSFBOType;
|
||||||
} else if (ctxInfo.hasExtension("GL_IMG_multisampled_render_to_texture")) {
|
} else if (ctxInfo.hasExtension("GL_IMG_multisampled_render_to_texture")) {
|
||||||
fMSFBOType = kES_IMG_MsToTexture_MSFBOType;
|
fMSFBOType = kES_IMG_MsToTexture_MSFBOType;
|
||||||
} else if (fUsesMixedSamples) {
|
|
||||||
fMSFBOType = kMixedSamples_MSFBOType;
|
|
||||||
} else if (ctxInfo.version() >= GR_GL_VER(3,0)) {
|
} else if (ctxInfo.version() >= GR_GL_VER(3,0)) {
|
||||||
fMSFBOType = kStandard_MSFBOType;
|
fMSFBOType = kStandard_MSFBOType;
|
||||||
} else if (ctxInfo.hasExtension("GL_CHROMIUM_framebuffer_multisample")) {
|
} else if (ctxInfo.hasExtension("GL_CHROMIUM_framebuffer_multisample")) {
|
||||||
|
Loading…
Reference in New Issue
Block a user