Revert of Add infastructure for gl_SampleMask

src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrGLSLFragmentShaderBuilder.h"
 #include "GrRenderTarget.h"
 #include "gl/GrGLGpu.h"
@@ skipping 59 matching lines @@
                                                          uint8_t fragPosKey)
     : INHERITED(program)
     , fSetupFragPosition(false)
     , fTopLeftFragPosRead(kTopLeftFragPosRead_FragPosKey == fragPosKey)
     , fCustomColorOutputIndex(-1)
     , fHasReadDstColor(false)
     , fHasReadFragmentPosition(false) {
 }
 
 bool GrGLSLFragmentShaderBuilder::enableFeature(GLSLFeature feature) {
-    const GrGLSLCaps& glslCaps = *fProgramBuilder->glslCaps();
     switch (feature) {
-        case kStandardDerivatives_GLSLFeature:
-            if (!glslCaps.shaderDerivativeSupport()) {
+        case kStandardDerivatives_GLSLFeature: {
+            if (!fProgramBuilder->glslCaps()->shaderDerivativeSupport()) {
                 return false;
             }
-            if (const char* extension = glslCaps.shaderDerivativeExtensionString()) {
+            const char* extension = fProgramBuilder->glslCaps()->shaderDerivativeExtensionString();
+            if (extension) {
                 this->addFeature(1 << kStandardDerivatives_GLSLFeature, extension);
             }
             return true;
-        case kPixelLocalStorage_GLSLFeature:
+        }
+        case kPixelLocalStorage_GLSLFeature: {
             if (fProgramBuilder->glslCaps()->pixelLocalStorageSize() <= 0) {
                 return false;
             }
             this->addFeature(1 << kPixelLocalStorage_GLSLFeature,
                              "GL_EXT_shader_pixel_local_storage");
             return true;
-        case kSampleVariables_GLSLFeature:
-            if (!glslCaps.sampleVariablesSupport()) {
-                return false;
-            }
-            if (const char* extension = glslCaps.sampleVariablesExtensionString()) {
-                this->addFeature(1 << kSampleVariables_GLSLFeature, extension);
-            }
-            return true;
-        case kSampleMaskOverrideCoverage_GLSLFeature:
-            if (!glslCaps.sampleMaskOverrideCoverageSupport()) {
-                return false;
-            }
-            if (!this->enableFeature(kSampleVariables_GLSLFeature)) {
-                return false;
-            }
-            if (this->addFeature(1 << kSampleMaskOverrideCoverage_GLSLFeature,
-                                 "GL_NV_sample_mask_override_coverage")) {
-                // Redeclare gl_SampleMask with layout(override_coverage) if we haven't already.
-                fOutputs.push_back().set(kInt_GrSLType, GrShaderVar::kOut_TypeModifier,
-                                         "gl_SampleMask", 1, kHigh_GrSLPrecision,
-                                         "override_coverage");
-            }
-            return true;
+        }
         default:
             SkFAIL("Unexpected GLSLFeature requested.");
             return false;
     }
 }
 
 SkString GrGLSLFragmentShaderBuilder::ensureFSCoords2D(const GrGLSLTransformedCoordsArray& coords,
                                                        int index) {
     if (kVec3f_GrSLType != coords[index].getType()) {
         SkASSERT(kVec2f_GrSLType == coords[index].getType());
@@ skipping 163 matching lines @@
 }
 
 void GrGLSLFragmentBuilder::onAfterChildProcEmitCode() {
     SkASSERT(fSubstageIndices.count() >= 2);
     fSubstageIndices.pop_back();
     fSubstageIndices.back()++;
     int removeAt = fMangleString.findLastOf('_');
     fMangleString.remove(removeAt, fMangleString.size() - removeAt);
 }