diff options
| author |  bsalomon <bsalomon@google.com> | 2016-09-29 10:07:22 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-29 10:07:22 -0700 |
| commit | 7c2213ba61c61ab76117019f95705639e2f01de8 (patch) | |
| tree | 7d43758e0c433f03b7c1915f873bdcb5a5b63302 /tools/gpu/GrContextFactory.cpp | |
| parent | 50094fb489543655df026be4e4f99e09e57a1f49 (diff) | |
Revert of Explicit control in tools of ANGLE frontend and backend (patchset #6 id:90001 of https://codereview.chromium.org/2381033002/ )
Reason for revert:
Broke bots
Original issue's description:
> Explicit control in tools of ANGLE frontend and backend
>
> Update the ANGLE test GL context, GrContextFactory, and config parsing to allow explicit control of ANGLE front/backend.
>
> This will allow us to explicitly test ES2 vs ES3 interfaces to ANGLE as well as D3D9, D3D11, and OpenGL backends.
>
> Also makes the angle api types valid in all builds (but will just fail when SK_ANGLE=1 or not on windows for the d3d backends).
>
> BUG=skia:5804
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2381033002
>
> Committed: https://skia.googlesource.com/skia/+/50094fb489543655df026be4e4f99e09e57a1f49
TBR=brianosman@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:5804
Review-Url: https://codereview.chromium.org/2384483003
Diffstat (limited to 'tools/gpu/GrContextFactory.cpp')
| -rw-r--r-- | tools/gpu/GrContextFactory.cpp | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp index 4f189942bd..5e6494f778 100644 --- a/tools/gpu/GrContextFactory.cpp +++ b/tools/gpu/GrContextFactory.cpp @@ -117,24 +117,13 @@ ContextInfo GrContextFactory::getContextInfo(ContextType type, ContextOptions op glCtx = CreatePlatformGLTestContext(kGLES_GrGLStandard); break; #if SK_ANGLE - case kANGLE_D3D9_ES2_ContextType: - glCtx = CreateANGLETestContext(ANGLEBackend::kD3D9, ANGLEContextVersion::kES2); +# ifdef SK_BUILD_FOR_WIN + case kANGLE_ContextType: + glCtx = CreateANGLEDirect3DGLTestContext(); break; - case kANGLE_D3D11_ES2_ContextType: - glCtx = CreateANGLETestContext(ANGLEBackend::kD3D11, - ANGLEContextVersion::kES2); - break; - case kANGLE_D3D11_ES3_ContextType: - glCtx = CreateANGLETestContext(ANGLEBackend::kD3D11, - ANGLEContextVersion::kES3); - break; - case kANGLE_GL_ES2_ContextType: - glCtx = CreateANGLETestContext(ANGLEBackend::kOpenGL, - ANGLEContextVersion::kES2); - break; - case kANGLE_GL_ES3_ContextType: - glCtx = CreateANGLETestContext(ANGLEBackend::kOpenGL, - ANGLEContextVersion::kES3); +# endif + case kANGLE_GL_ContextType: + glCtx = CreateANGLEOpenGLGLTestContext(); break; #endif case kCommandBuffer_ContextType: |