commit 149b3ec2b1ccaf00e40bf296d2a3394852d73fe9
author cdalton <cdalton@nvidia.com> Wed Sep 17 09:19:18 2014 -0700
committer Commit bot <commit-bot@chromium.org> Wed Sep 17 09:19:18 2014 -0700
tree c945ae380eb26860b4db4d9137afd247100955a6
parent 9a0267fa9aa1dab078ab67b40b647de5be80696f

Adds glMemoryGlyphIndexArrayNV to the GrGLInterface and begins
detecting support for this method in GrGLPathRendering.

BUG=skia:2939
R=bsalomon@google.com

Author: cdalton@nvidia.com

Review URL: https://codereview.chromium.org/570733002

src/gpu/gl/GrGLPathRendering.cpp

diff --git a/src/gpu/gl/GrGLPathRendering.cpp b/src/gpu/gl/GrGLPathRendering.cpp
index f524ff2..81d47c4 100644
--- a/src/gpu/gl/GrGLPathRendering.cpp
+++ b/src/gpu/gl/GrGLPathRendering.cpp
@@ -49,13 +49,15 @@
     : fGpu(gpu) {
     const GrGLInterface* glInterface = gpu->glInterface();
     fCaps.stencilThenCoverSupport =
-        glInterface->fFunctions.fStencilThenCoverFillPath &&
-        glInterface->fFunctions.fStencilThenCoverStrokePath &&
-        glInterface->fFunctions.fStencilThenCoverFillPathInstanced &&
-        glInterface->fFunctions.fStencilThenCoverStrokePathInstanced;
+        NULL != glInterface->fFunctions.fStencilThenCoverFillPath &&
+        NULL != glInterface->fFunctions.fStencilThenCoverStrokePath &&
+        NULL != glInterface->fFunctions.fStencilThenCoverFillPathInstanced &&
+        NULL != glInterface->fFunctions.fStencilThenCoverStrokePathInstanced;
     fCaps.fragmentInputGenSupport =
         kGLES_GrGLStandard == glInterface->fStandard &&
-        glInterface->fFunctions.fProgramPathFragmentInputGen;
+        NULL != glInterface->fFunctions.fProgramPathFragmentInputGen;
+    fCaps.glyphLoadingSupport =
+        NULL != glInterface->fFunctions.fPathMemoryGlyphIndexArray;
 
     if (!fCaps.fragmentInputGenSupport) {
         fHWPathTexGenSettings.reset(fGpu->glCaps().maxFixedFunctionTextureCoords());