From 3b4d077fba1ad037536db198608a940c47d91888 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Wed, 6 Aug 2014 10:52:33 -0700 Subject: [PATCH] Add angle config to nanobench and make angle a default config for dm and nanobench. NOTREECHECKS=true R=mtklein@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/441333003 --- bench/nanobench.cpp | 3 +++ tools/flags/SkCommonFlags.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 2dfd33f..c808183 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -282,6 +282,9 @@ static void create_configs(SkTDArray* configs) { GPU_CONFIG(nvprmsaa16, kNVPR_GLContextType, 16) GPU_CONFIG(debug, kDebug_GLContextType, 0) GPU_CONFIG(nullgpu, kNull_GLContextType, 0) +#ifdef SK_ANGLE + GPU_CONFIG(angle, kANGLE_GLContextType, 0) +#endif } #endif } diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp index beeb6ee..ca2e18c 100644 --- a/tools/flags/SkCommonFlags.cpp +++ b/tools/flags/SkCommonFlags.cpp @@ -8,7 +8,7 @@ #include "SkCommonFlags.h" #include "SkThreadPool.h" -DEFINE_string(config, "565 8888 pdf gpu nonrendering", +DEFINE_string(config, "565 8888 pdf gpu nonrendering angle", "Options: 565 8888 pdf gpu nonrendering msaa4 msaa16 nvprmsaa4 nvprmsaa16 " "gpunull gpudebug angle mesa"); -- 2.7.4