| Index: src/gpu/gl/GrGLCaps.cpp
|
| diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
|
| index f23a5b80bc62aca605c4590cd67a04a24e8acad3..546b0bf692a57b621d28ae7dd7e7a1b34b688ed5 100644
|
| --- a/src/gpu/gl/GrGLCaps.cpp
|
| +++ b/src/gpu/gl/GrGLCaps.cpp
|
| @@ -564,9 +564,19 @@ const char* get_glsl_version_decl_string(GrGLStandard standard, GrGLSLGeneration
|
| return "#version 330 compatibility\n";
|
| }
|
| }
|
| + case k400_GrGLSLGeneration:
|
| + SkASSERT(kGL_GrGLStandard == standard);
|
| + if (isCoreProfile) {
|
| + return "#version 400\n";
|
| + } else {
|
| + return "#version 400 compatibility\n";
|
| + }
|
| case k310es_GrGLSLGeneration:
|
| SkASSERT(kGLES_GrGLStandard == standard);
|
| return "#version 310 es\n";
|
| + case k320es_GrGLSLGeneration:
|
| + SkASSERT(kGLES_GrGLStandard == standard);
|
| + return "#version 320 es\n";
|
| }
|
| return "<no version>";
|
| }
|
| @@ -625,6 +635,22 @@ void GrGLCaps::initGLSL(const GrGLContextInfo& ctxInfo) {
|
| }
|
| }
|
|
|
| + if (kGL_GrGLStandard == standard) {
|
| + glslCaps->fSampleVariablesSupport = ctxInfo.glslGeneration() >= k400_GrGLSLGeneration;
|
| + } else {
|
| + if (ctxInfo.glslGeneration() >= k320es_GrGLSLGeneration) {
|
| + glslCaps->fSampleVariablesSupport = true;
|
| + } else if (ctxInfo.hasExtension("GL_OES_sample_variables")) {
|
| + glslCaps->fSampleVariablesSupport = true;
|
| + glslCaps->fSampleVariablesExtensionString = "GL_OES_sample_variables";
|
| + }
|
| + }
|
| +
|
| + if (glslCaps->fSampleVariablesSupport) {
|
| + glslCaps->fSampleMaskOverrideCoverageSupport =
|
| + ctxInfo.hasExtension("GL_NV_sample_mask_override_coverage");
|
| + }
|
| +
|
| // Adreno GPUs have a tendency to drop tiles when there is a divide-by-zero in a shader
|
| glslCaps->fDropsTileOnZeroDivide = kQualcomm_GrGLVendor == ctxInfo.vendor();
|
|
|
|
|