Revert of Fix setColocatedSampleLocations on ES and GL < 4.5 (patchset #2 id:20001 of https://coder…

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 292 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");
-    }
+    glslCaps->fProgrammableSampleLocationsSupport =
+        ctxInfo.hasExtension("GL_NV_sample_locations") ||
+        ctxInfo.hasExtension("GL_ARB_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.
@@ skipping 978 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) {}