Chromium Code Reviews| Index: src/gpu/gl/GrGLInterface.cpp |
| diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp |
| index e9ba32ed2484276ef23e01ee20225458d24dbacb..f118147c41ab0317db070fb1807b746ea916686c 100644 |
| --- a/src/gpu/gl/GrGLInterface.cpp |
| +++ b/src/gpu/gl/GrGLInterface.cpp |
| @@ -56,6 +56,10 @@ const GrGLInterface* GrGLInterfaceRemoveNVPR(const GrGLInterface* interface) { |
| newInterface->fFunctions.fCoverStrokePath = NULL; |
| newInterface->fFunctions.fCoverFillPathInstanced = NULL; |
| newInterface->fFunctions.fCoverStrokePathInstanced = NULL; |
| + newInterface->fFunctions.fStencilThenCoverFillPath = NULL; |
| + newInterface->fFunctions.fStencilThenCoverStrokePath = NULL; |
| + newInterface->fFunctions.fStencilThenCoverFillPathInstanced = NULL; |
| + newInterface->fFunctions.fStencilThenCoverStrokePathInstanced = NULL; |
| newInterface->fFunctions.fProgramPathFragmentInputGen = NULL; |
| return newInterface; |
| } |
| @@ -467,18 +471,23 @@ bool GrGLInterface::validate() const { |
| NULL == fFunctions.fCoverFillPath || |
| NULL == fFunctions.fCoverStrokePath || |
| NULL == fFunctions.fCoverFillPathInstanced || |
| - NULL == fFunctions.fCoverStrokePathInstanced || |
| - NULL == fFunctions.fStencilThenCoverFillPath || |
| - NULL == fFunctions.fStencilThenCoverStrokePath || |
| - NULL == fFunctions.fStencilThenCoverFillPathInstanced || |
| - NULL == fFunctions.fStencilThenCoverStrokePathInstanced) { |
| + NULL == fFunctions.fCoverStrokePathInstanced) { |
| RETURN_FALSE_INTERFACE |
| } |
| - // Currently ProgramPathFragmentInputGen is not used on |
| - // OpenGL, rather PathTexGen is. |
| - if ((kGL_GrGLStandard == fStandard && NULL == fFunctions.fPathTexGen) || |
| - (kGLES_GrGLStandard == fStandard && NULL == fFunctions.fProgramPathFragmentInputGen)) { |
| - RETURN_FALSE_INTERFACE |
| + if (kGL_GrGLStandard == fStandard) { |
| + // Some methods only exist on desktop |
| + if (NULL == fFunctions.fPathTexGen) { |
| + RETURN_FALSE_INTERFACE |
| + } |
| + } else { |
| + // v1.3 methods always exist on ES |
|
Mark Kilgard
2014/07/31 19:02:18
really v1.2 methods
|
| + if (NULL == fFunctions.fStencilThenCoverFillPath || |
| + NULL == fFunctions.fStencilThenCoverStrokePath || |
| + NULL == fFunctions.fStencilThenCoverFillPathInstanced || |
| + NULL == fFunctions.fStencilThenCoverStrokePathInstanced || |
| + NULL == fFunctions.fProgramPathFragmentInputGen) { |
| + RETURN_FALSE_INTERFACE |
| + } |
| } |
| } |