Revert of Fix mixed samples stencil clip

src/gpu/gl/GrGLCaps.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrGLCaps.h"
 
@@ skipping 25 matching lines @@
     fTexStorageSupport = false;
     fTextureRedSupport = false;
     fImagingSupport = false;
     fTwoFormatLimit = false;
     fFragCoordsConventionSupport = false;
     fVertexArrayObjectSupport = false;
     fInstancedDrawingSupport = false;
     fDirectStateAccessSupport = false;
     fDebugSupport = false;
     fES2CompatibilitySupport = false;
+    fMultisampleDisableSupport = false;
     fUseNonVBOVertexAndIndexDynamicData = false;
     fIsCoreProfile = false;
     fBindFragDataLocationSupport = false;
     fSRGBWriteControl = false;
     fRGBA8888PixelsOpsAreSlow = false;
     fPartialFBOReadIsSlow = false;
 
     fReadPixelsSupportedCache.reset();
 
     fShaderCaps.reset(new GrGLSLCaps(contextOptions));
@@ skipping 189 matching lines @@
         fES2CompatibilitySupport = true;
     }
 
     if (kGL_GrGLStandard == standard) {
         fMultisampleDisableSupport = true;
     } else {
         fMultisampleDisableSupport = ctxInfo.hasExtension("GL_EXT_multisample_compatibility");
     }
 
     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;
         }
     } else {
         if (version >= GR_GL_VER(3, 0) && ctxInfo.hasExtension("GL_EXT_blend_func_extended")) {
             fBindFragDataLocationSupport = true;
         }
     }
 
 #if 0 // Disabled due to http://skbug.com/4454
@@ skipping 37 matching lines @@
         glslCaps->fGeometryShaderSupport = ctxInfo.version() >= GR_GL_VER(3, 2) &&
             ctxInfo.glslGeneration() >= k150_GrGLSLGeneration;
     }
     else {
         glslCaps->fDualSourceBlendingSupport = ctxInfo.hasExtension("GL_EXT_blend_func_extended");
 
         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");
+    }
+
     /**************************************************************************
      * GrCaps fields
      **************************************************************************/
 
     // We need dual source blending and the ability to disable multisample in order to support mixed
     // samples in every corner case.
     if (fMultisampleDisableSupport && glslCaps->dualSourceBlendingSupport()) {
         fMixedSamplesSupport = ctxInfo.hasExtension("GL_NV_framebuffer_mixed_samples");
         // Workaround NVIDIA bug related to glInvalidateFramebuffer and mixed samples.
         if (fMixedSamplesSupport && kNVIDIA_GrGLDriver == ctxInfo.driver()) {
@@ skipping 842 matching lines @@
     r.appendf("Texture Storage support: %s\n", (fTexStorageSupport ? "YES": "NO"));
     r.appendf("GL_R support: %s\n", (fTextureRedSupport ? "YES": "NO"));
     r.appendf("GL_ARB_imaging support: %s\n", (fImagingSupport ? "YES": "NO"));
     r.appendf("Two Format Limit: %s\n", (fTwoFormatLimit ? "YES": "NO"));
     r.appendf("Fragment coord conventions support: %s\n",
              (fFragCoordsConventionSupport ? "YES": "NO"));
     r.appendf("Vertex array object support: %s\n", (fVertexArrayObjectSupport ? "YES": "NO"));
     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"));
     r.appendf("RGBA 8888 pixel ops are slow: %s\n", (fRGBA8888PixelsOpsAreSlow ? "YES" : "NO"));
     r.appendf("Partial FBO read is slow: %s\n", (fPartialFBOReadIsSlow ? "YES" : "NO"));
     r.appendf("Bind uniform location support: %s\n", (fBindUniformLocationSupport ? "YES" : "NO"));
     return r;
 }
 
 static GrGLenum precision_to_gl_float_type(GrSLPrecision p) {
@@ skipping 114 matching lines @@
     glslCaps->fConfigSwizzle[kR11_EAC_GrPixelConfig] = "rrrr";
     glslCaps->fConfigSwizzle[kASTC_12x12_GrPixelConfig] = "rgba";
     glslCaps->fConfigSwizzle[kRGBA_float_GrPixelConfig] = "rgba";
     glslCaps->fConfigSwizzle[kRGBA_half_GrPixelConfig] = "rgba";
 
 }
 
 void GrGLCaps::onApplyOptionsOverrides(const GrContextOptions& options) {}