| Index: src/gpu/gl/GrGLCaps.cpp
|
| diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
|
| index f5ce0afff25820c2c0232e7d8e2a78def39faa12..82831475f1060ed5df95df40f201f43eebb8d8f8 100644
|
| --- a/src/gpu/gl/GrGLCaps.cpp
|
| +++ b/src/gpu/gl/GrGLCaps.cpp
|
| @@ -310,16 +310,9 @@ void GrGLCaps::init(const GrContextOptions& contextOptions,
|
| 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
|
|
|