diff options
| author |  mtklein <mtklein@chromium.org> | 2016-09-21 14:01:32 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-21 14:01:32 -0700 |
| commit | 605d95289379a07aad50b38ca6badbee45813d56 (patch) | |
| tree | 23cef452ba2c78352e36a62382731fc5c4289ddb /tools | |
| parent | 0e4a466a613fa02292dfdbd8d4097fc14f191c42 (diff) | |
GN: take over CommandBuffer bot
As you suspected, I see nothing preventing us from building our side of things unconditionally.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2358173002
NOTREECHECKS=true
Review-Url: https://codereview.chromium.org/2358173002
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/flags/SkCommonFlagsConfig.cpp | 6 | ||||
| -rw-r--r-- | tools/gpu/GrContextFactory.cpp | 6 | ||||
| -rw-r--r-- | tools/gpu/gl/command_buffer/GLTestContext_command_buffer.cpp | 9 |
3 files changed, 1 insertions, 20 deletions
diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp index 381f9c50f2..d0e5f60e4f 100644 --- a/tools/flags/SkCommonFlagsConfig.cpp +++ b/tools/flags/SkCommonFlagsConfig.cpp @@ -66,9 +66,7 @@ static const struct { #endif ,{ "angle-gl", "gpu", "api=angle-gl" } #endif -#if SK_COMMAND_BUFFER ,{ "commandbuffer", "gpu", "api=commandbuffer" } -#endif #if SK_MESA ,{ "mesa", "gpu", "api=mesa" } #endif @@ -122,9 +120,7 @@ static const char configExtendedHelp[] = #endif "\t\tangle-gl\t\t\tUse ANGLE OpenGL.\n" #endif -#if SK_COMMAND_BUFFER "\t\tcommandbuffer\t\tUse command buffer.\n" -#endif #if SK_MESA "\t\tmesa\t\t\tUse MESA.\n" #endif @@ -249,12 +245,10 @@ static bool parse_option_gpu_api(const SkString& value, return true; } #endif -#if SK_COMMAND_BUFFER if (value.equals("commandbuffer")) { *outContextType = GrContextFactory::kCommandBuffer_ContextType; return true; } -#endif #if SK_MESA if (value.equals("mesa")) { *outContextType = GrContextFactory::kMESA_ContextType; diff --git a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp index c40764b109..5e6494f778 100644 --- a/tools/gpu/GrContextFactory.cpp +++ b/tools/gpu/GrContextFactory.cpp @@ -12,9 +12,7 @@ #if SK_ANGLE #include "gl/angle/GLTestContext_angle.h" #endif -#if SK_COMMAND_BUFFER - #include "gl/command_buffer/GLTestContext_command_buffer.h" -#endif +#include "gl/command_buffer/GLTestContext_command_buffer.h" #include "gl/debug/DebugGLTestContext.h" #if SK_MESA #include "gl/mesa/GLTestContext_mesa.h" @@ -128,11 +126,9 @@ ContextInfo GrContextFactory::getContextInfo(ContextType type, ContextOptions op glCtx = CreateANGLEOpenGLGLTestContext(); break; #endif -#if SK_COMMAND_BUFFER case kCommandBuffer_ContextType: glCtx = CommandBufferGLTestContext::Create(); break; -#endif #if SK_MESA case kMESA_ContextType: glCtx = CreateMesaGLTestContext(); diff --git a/tools/gpu/gl/command_buffer/GLTestContext_command_buffer.cpp b/tools/gpu/gl/command_buffer/GLTestContext_command_buffer.cpp index 64d828f696..2330c94b42 100644 --- a/tools/gpu/gl/command_buffer/GLTestContext_command_buffer.cpp +++ b/tools/gpu/gl/command_buffer/GLTestContext_command_buffer.cpp @@ -14,9 +14,6 @@ #include "../ports/SkOSEnvironment.h" #include "../ports/SkOSLibrary.h" -#if defined SK_BUILD_FOR_MAC - -// EGL doesn't exist on the mac, so expose what we need to get the command buffer's EGL running. typedef void *EGLDisplay; typedef unsigned int EGLBoolean; typedef void *EGLConfig; @@ -48,12 +45,6 @@ typedef void (*__eglMustCastToProperFunctionPointerType)(void); #define EGL_WIDTH 0x3057 #define EGL_HEIGHT 0x3056 -#else - -#include <EGL/egl.h> - -#endif - typedef EGLDisplay (*GetDisplayProc)(EGLNativeDisplayType display_id); typedef EGLBoolean (*InitializeProc)(EGLDisplay dpy, EGLint *major, EGLint *minor); typedef EGLBoolean (*TerminateProc)(EGLDisplay dpy); |