From 98cad6219b430eddf5528473311279f21dbd2e10 Mon Sep 17 00:00:00 2001 From: cdalton Date: Tue, 3 Nov 2015 09:33:21 -0800 Subject: Fix setColocatedSampleLocations on ES and GL < 4.5 Updates setColocatedSampleLocations to use glFramebufferParameteri when the DSA version glNamedFramebufferParameteri is not present. BUG=skia: Review URL: https://codereview.chromium.org/1415503008 --- src/gpu/gl/GrGLCaps.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/gpu/gl/GrGLCaps.cpp') diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 86ff54e830..de7fcd5c57 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -324,9 +324,17 @@ void GrGLCaps::init(const GrContextOptions& contextOptions, fDiscardRenderTargetSupport = false; fInvalidateFBType = kNone_InvalidateFBType; } - glslCaps->fProgrammableSampleLocationsSupport = - ctxInfo.hasExtension("GL_NV_sample_locations") || - ctxInfo.hasExtension("GL_ARB_sample_locations"); + + 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 -- cgit v1.2.3