diff options
author | 2014-08-06 11:15:50 -0400 | |
---|---|---|
committer | 2014-08-06 11:15:50 -0400 | |
commit | 760ba8d39293cf60a516d03a2acd8492f9f5effa (patch) | |
tree | 355e203876b68081a9db2f4c7c070515582fa321 /src/gpu/gl/GrGLInterface.cpp | |
parent | af13c7c50efa5fda8a12a720dc77b8bc36d966a9 (diff) |
Revert "Adds a GrGLPathRendering class that wraps the NV_path_rendering"
This reverts commit 5672da0fa54f31c9727568e9dd5fe82c6e1585bc.
This appears to be blocking the Skia roll by causing failures in the blink layout tests on the canvas-lost-gpu-context.html test.
The bisect for this can be seen at:
https://codereview.chromium.org/449473002/
Original issue's description:
> Adds a GrGLPathRendering class that wraps the NV_path_rendering
> extension and manages its various API versions. It also provides
> backup implementations when certain NVpr methods from later API
> versions are not present on the current system.
>
> Committed: https://skia.googlesource.com/skia/+/5672da0fa54f31c9727568e9dd5fe82c6e1585bc
Diffstat (limited to 'src/gpu/gl/GrGLInterface.cpp')
-rw-r--r-- | src/gpu/gl/GrGLInterface.cpp | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp index c192611f50..e9ba32ed24 100644 --- a/src/gpu/gl/GrGLInterface.cpp +++ b/src/gpu/gl/GrGLInterface.cpp @@ -56,10 +56,6 @@ 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; } @@ -471,23 +467,18 @@ bool GrGLInterface::validate() const { NULL == fFunctions.fCoverFillPath || NULL == fFunctions.fCoverStrokePath || NULL == fFunctions.fCoverFillPathInstanced || - NULL == fFunctions.fCoverStrokePathInstanced) { + NULL == fFunctions.fCoverStrokePathInstanced || + NULL == fFunctions.fStencilThenCoverFillPath || + NULL == fFunctions.fStencilThenCoverStrokePath || + NULL == fFunctions.fStencilThenCoverFillPathInstanced || + NULL == fFunctions.fStencilThenCoverStrokePathInstanced) { RETURN_FALSE_INTERFACE } - if (kGL_GrGLStandard == fStandard) { - // Some methods only exist on desktop - if (NULL == fFunctions.fPathTexGen) { - RETURN_FALSE_INTERFACE - } - } else { - // All additions through v1.3 exist on GLES - if (NULL == fFunctions.fStencilThenCoverFillPath || - NULL == fFunctions.fStencilThenCoverStrokePath || - NULL == fFunctions.fStencilThenCoverFillPathInstanced || - NULL == fFunctions.fStencilThenCoverStrokePathInstanced || - NULL == fFunctions.fProgramPathFragmentInputGen) { - 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 } } |