aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2014-08-06 10:52:33 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-08-06 10:52:34 -0700
commit3b4d077fba1ad037536db198608a940c47d91888 (patch)
treeeb07f610d5d0be7417a9716478383e6dd51be7c9
parenta7e930f640b8757686650384761ecff117b46bd2 (diff)
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
-rw-r--r--bench/nanobench.cpp3
-rw-r--r--tools/flags/SkCommonFlags.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 2dfd33f594..c808183b19 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -282,6 +282,9 @@ static void create_configs(SkTDArray<Config>* 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 beeb6ee0c4..ca2e18c135 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");