| Index: src/gpu/gl/GrGLCaps.cpp
|
| diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
|
| index a9ccae7705eeb845232a0ef8ab9bc852c09aa5f3..1ce3b455c4e6949e6e72d952342c2b3306a718e5 100644
|
| --- a/src/gpu/gl/GrGLCaps.cpp
|
| +++ b/src/gpu/gl/GrGLCaps.cpp
|
| @@ -781,6 +781,8 @@ void GrGLCaps::initFSAASupport(const GrGLContextInfo& ctxInfo, const GrGLInterfa
|
| fMSFBOType = kES_EXT_MsToTexture_MSFBOType;
|
| } else if (ctxInfo.hasExtension("GL_IMG_multisampled_render_to_texture")) {
|
| fMSFBOType = kES_IMG_MsToTexture_MSFBOType;
|
| + } else if (ctxInfo.hasExtension("GL_NV_framebuffer_mixed_samples")) {
|
| + fMSFBOType = kStencil_MSFBOType;
|
| } else if (ctxInfo.version() >= GR_GL_VER(3,0)) {
|
| fMSFBOType = GrGLCaps::kES_3_0_MSFBOType;
|
| } else if (ctxInfo.hasExtension("GL_CHROMIUM_framebuffer_multisample")) {
|
| @@ -791,7 +793,9 @@ void GrGLCaps::initFSAASupport(const GrGLContextInfo& ctxInfo, const GrGLInterfa
|
| fMSFBOType = kES_Apple_MSFBOType;
|
| }
|
| } else {
|
| - if ((ctxInfo.version() >= GR_GL_VER(3,0)) ||
|
| + if (ctxInfo.hasExtension("GL_NV_framebuffer_mixed_samples")) {
|
| + fMSFBOType = kStencil_MSFBOType;
|
| + } else if ((ctxInfo.version() >= GR_GL_VER(3,0)) ||
|
| ctxInfo.hasExtension("GL_ARB_framebuffer_object")) {
|
| fMSFBOType = GrGLCaps::kDesktop_ARB_MSFBOType;
|
| } else if (ctxInfo.hasExtension("GL_EXT_framebuffer_multisample") &&
|
| @@ -1003,6 +1007,7 @@ SkString GrGLCaps::dump() const {
|
| "Apple",
|
| "IMG MS To Texture",
|
| "EXT MS To Texture",
|
| + "Stencil",
|
| };
|
| GR_STATIC_ASSERT(0 == kNone_MSFBOType);
|
| GR_STATIC_ASSERT(1 == kDesktop_ARB_MSFBOType);
|
| @@ -1011,6 +1016,7 @@ SkString GrGLCaps::dump() const {
|
| GR_STATIC_ASSERT(4 == kES_Apple_MSFBOType);
|
| GR_STATIC_ASSERT(5 == kES_IMG_MsToTexture_MSFBOType);
|
| GR_STATIC_ASSERT(6 == kES_EXT_MsToTexture_MSFBOType);
|
| + GR_STATIC_ASSERT(7 == kStencil_MSFBOType);
|
| GR_STATIC_ASSERT(SK_ARRAY_COUNT(kMSFBOExtStr) == kLast_MSFBOType + 1);
|
|
|
| static const char* kInvalidateFBTypeStr[] = {
|
|
|