Revert of Fix mixed samples stencil clip

src/gpu/gl/GrGLCaps.cpp

Index: src/gpu/gl/GrGLCaps.cpp
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index acb83f5d815308c5d2192849caea45572dacaf62..c6a42cfc5432f610aa542a14704a26e0b696ff79 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -43,6 +43,7 @@
     fDirectStateAccessSupport = false;
     fDebugSupport = false;
     fES2CompatibilitySupport = false;
+    fMultisampleDisableSupport = false;
     fUseNonVBOVertexAndIndexDynamicData = false;
     fIsCoreProfile = false;
     fBindFragDataLocationSupport = false;
@@ -252,17 +253,6 @@
     }
 
     if (kGL_GrGLStandard == standard) {
-        fProgrammableSampleLocationsSupport =
-            ctxInfo.version() >= GR_GL_VER(4, 3) &&
-            (ctxInfo.hasExtension("GL_ARB_sample_locations") ||
-             ctxInfo.hasExtension("GL_NV_sample_locations"));
-    } else {
-        fProgrammableSampleLocationsSupport =
-            ctxInfo.version() >= GR_GL_VER(3, 1) &&
-            ctxInfo.hasExtension("GL_NV_sample_locations");
-    }
-
-    if (kGL_GrGLStandard == standard) {
         if (version >= GR_GL_VER(3, 0)) {
             fBindFragDataLocationSupport = true;
         }
@@ -318,6 +308,17 @@
 
         glslCaps->fShaderDerivativeSupport = ctxInfo.version() >= GR_GL_VER(3, 0) ||
             ctxInfo.hasExtension("GL_OES_standard_derivatives");
+    }
+
+    if (kGL_GrGLStandard == standard) {
+        glslCaps->fProgrammableSampleLocationsSupport =
+            ctxInfo.version() >= GR_GL_VER(4, 3) &&
+            (ctxInfo.hasExtension("GL_ARB_sample_locations") ||
+             ctxInfo.hasExtension("GL_NV_sample_locations"));
+    } else {
+        glslCaps->fProgrammableSampleLocationsSupport =
+            ctxInfo.version() >= GR_GL_VER(3, 1) &&
+            ctxInfo.hasExtension("GL_NV_sample_locations");
     }
 
     /**************************************************************************
@@ -1182,6 +1183,7 @@
     r.appendf("Instanced drawing support: %s\n", (fInstancedDrawingSupport ? "YES": "NO"));
     r.appendf("Direct state access support: %s\n", (fDirectStateAccessSupport ? "YES": "NO"));
     r.appendf("Debug support: %s\n", (fDebugSupport ? "YES": "NO"));
+    r.appendf("Multisample disable support: %s\n", (fMultisampleDisableSupport ? "YES" : "NO"));
     r.appendf("Use non-VBO for dynamic data: %s\n",
              (fUseNonVBOVertexAndIndexDynamicData ? "YES" : "NO"));
     r.appendf("SRGB write contol: %s\n", (fSRGBWriteControl ? "YES" : "NO"));