diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-11-11 15:35:34 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-14 14:34:11 +0000 |
| commit | 238b820369c4b556c2e7c8277855e6950de3d9eb (patch) | |
| tree | 765b061086aa14b09202d4bc3d27680c58b69d74 /tools/gpu/GrContextFactory.cpp | |
| parent | d7148f673a426c49d6d830b9d0bd5ee6077f1b9d (diff) | |
Always build the ANGLE test code. Always build ANGLE on windows and linux.
Make ANGLE test code independent of having ANGLE lib. Make ANGLE test code not include EGL headers.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4040
DOCS_PREVIEW= https://skia.org/?cl=4040
Change-Id: I7b857e9785246743f53fb969647b1162ce7419ab
Reviewed-on: https://skia-review.googlesource.com/4040
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'tools/gpu/GrContextFactory.cpp')
| -rw-r--r-- | tools/gpu/GrContextFactory.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp index ffc5295ab2..63d5f0a617 100644 --- a/tools/gpu/GrContextFactory.cpp +++ b/tools/gpu/GrContextFactory.cpp @@ -9,9 +9,7 @@ #include "GrContextFactory.h" #include "gl/GLTestContext.h" -#if SK_ANGLE - #include "gl/angle/GLTestContext_angle.h" -#endif +#include "gl/angle/GLTestContext_angle.h" #include "gl/command_buffer/GLTestContext_command_buffer.h" #include "gl/debug/DebugGLTestContext.h" #if SK_MESA @@ -116,7 +114,6 @@ ContextInfo GrContextFactory::getContextInfo(ContextType type, ContextOptions op case kGLES_ContextType: glCtx = CreatePlatformGLTestContext(kGLES_GrGLStandard); break; -#if SK_ANGLE case kANGLE_D3D9_ES2_ContextType: glCtx = MakeANGLETestContext(ANGLEBackend::kD3D9, ANGLEContextVersion::kES2).release(); break; @@ -132,7 +129,6 @@ ContextInfo GrContextFactory::getContextInfo(ContextType type, ContextOptions op case kANGLE_GL_ES3_ContextType: glCtx = MakeANGLETestContext(ANGLEBackend::kOpenGL, ANGLEContextVersion::kES3).release(); break; -#endif case kCommandBuffer_ContextType: glCtx = CommandBufferGLTestContext::Create(); break; |