Revert of Fix mixed samples stencil clip

src/gpu/GrCaps.cpp

Index: src/gpu/GrCaps.cpp
diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp
index 1020add31dafcf19ddb9cf29fc901c1c0c8fd662..3331db55670e4719512e813501a53e37b982d14d 100644
--- a/src/gpu/GrCaps.cpp
+++ b/src/gpu/GrCaps.cpp
@@ -15,6 +15,7 @@
     fPathRenderingSupport = false;
     fDstReadInShaderSupport = false;
     fDualSourceBlendingSupport = false;
+    fProgrammableSampleLocationsSupport = false;
     fShaderPrecisionVaries = false;
 }
 
@@ -50,6 +51,7 @@
     r.appendf("Path Rendering Support                : %s\n", gNY[fPathRenderingSupport]);
     r.appendf("Dst Read In Shader Support            : %s\n", gNY[fDstReadInShaderSupport]);
     r.appendf("Dual Source Blending Support          : %s\n", gNY[fDualSourceBlendingSupport]);
+    r.appendf("Programmable Sample Locations Support : %s\n", gNY[fProgrammableSampleLocationsSupport]);
 
     r.appendf("Shader Float Precisions (varies: %s)  :\n", gNY[fShaderPrecisionVaries]);
 
@@ -90,8 +92,6 @@
     fCompressedTexSubImageSupport = false;
     fOversizedStencilSupport = false;
     fTextureBarrierSupport = false;
-    fMultisampleDisableSupport = false;
-    fProgrammableSampleLocationsSupport = false;
     fMixedSamplesSupport = false;
     fSupportsInstancedDraws = false;
     fFullClearIsFree = false;
@@ -164,9 +164,6 @@
     r.appendf("Compressed Update Support          : %s\n", gNY[fCompressedTexSubImageSupport]);
     r.appendf("Oversized Stencil Support          : %s\n", gNY[fOversizedStencilSupport]);
     r.appendf("Texture Barrier Support            : %s\n", gNY[fTextureBarrierSupport]);
-    r.appendf("Multisample Disable Support        : %s\n", gNY[fMultisampleDisableSupport]);
-    r.appendf("Programmable Sample Locations Support : %s\n",
-              gNY[fProgrammableSampleLocationsSupport]);
     r.appendf("Mixed Samples Support              : %s\n", gNY[fMixedSamplesSupport]);
     r.appendf("Supports instanced draws           : %s\n", gNY[fSupportsInstancedDraws]);
     r.appendf("Full screen clear is free          : %s\n", gNY[fFullClearIsFree]);