aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2016-04-01 13:38:04 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-01 13:38:05 -0700
commit2d9c6f81353597aebf5934547e5cba7a872196fb (patch)
tree39f4cf8bfe87211cb06ccee76e527e9e6860d59d /bench
parent6e2aad4e9f6280aa2b710e7324458fdc6d699ec5 (diff)
Rename enums in GrContextFactory to remove "GL"
Also, remove kNative as a separate context type and instead make it an alias for kGL or kGLES based on OS. GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1845923004 Review URL: https://codereview.chromium.org/1845923004
Diffstat (limited to 'bench')
-rw-r--r--bench/nanobench.cpp16
-rw-r--r--bench/nanobench.h4
2 files changed, 10 insertions, 10 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 521824e97b..5e26b48395 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -385,11 +385,11 @@ static int setup_gpu_bench(Target* target, Benchmark* bench, int maxGpuFrameLag)
}
#if SK_SUPPORT_GPU
-#define kBogusGLContextType GrContextFactory::kNative_GLContextType
-#define kBogusGLContextOptions GrContextFactory::kNone_GLContextOptions
+#define kBogusContextType GrContextFactory::kNativeGL_ContextType
+#define kBogusContextOptions GrContextFactory::kNone_ContextOptions
#else
-#define kBogusGLContextType 0
-#define kBogusGLContextOptions 0
+#define kBogusContextType 0
+#define kBogusContextOptions 0
#endif
static void create_config(const SkCommandLineConfig* config, SkTArray<Config>* configs) {
@@ -399,8 +399,8 @@ static void create_config(const SkCommandLineConfig* config, SkTArray<Config>* c
if (!FLAGS_gpu)
return;
- const auto ctxOptions = gpuConfig->getUseNVPR() ? GrContextFactory::kEnableNVPR_GLContextOptions
- : GrContextFactory::kNone_GLContextOptions;
+ const auto ctxOptions = gpuConfig->getUseNVPR() ? GrContextFactory::kEnableNVPR_ContextOptions
+ : GrContextFactory::kNone_ContextOptions;
const auto ctxType = gpuConfig->getContextType();
const auto sampleCount = gpuConfig->getSamples();
@@ -437,7 +437,7 @@ static void create_config(const SkCommandLineConfig* config, SkTArray<Config>* c
if (config->getTag().equals(#name)) { \
Config config = { \
SkString(#name), Benchmark::backend, color, alpha, profile, \
- 0, kBogusGLContextType, kBogusGLContextOptions, false \
+ 0, kBogusContextType, kBogusContextOptions, false \
}; \
configs->push_back(config); \
return; \
@@ -463,7 +463,7 @@ static void create_config(const SkCommandLineConfig* config, SkTArray<Config>* c
if (config->getTag().equals("hwui")) {
Config config = { SkString("hwui"), Benchmark::kHWUI_Backend,
kRGBA_8888_SkColorType, kPremul_SkAlphaType, kLinear_SkColorProfileType,
- 0, kBogusGLContextType, kBogusGLContextOptions, false };
+ 0, kBogusContextType, kBogusContextOptions, false };
configs->push_back(config);
}
#endif
diff --git a/bench/nanobench.h b/bench/nanobench.h
index 844811e26d..ceab0f6c4f 100644
--- a/bench/nanobench.h
+++ b/bench/nanobench.h
@@ -29,8 +29,8 @@ struct Config {
SkColorProfileType profile;
int samples;
#if SK_SUPPORT_GPU
- sk_gpu_test::GrContextFactory::GLContextType ctxType;
- sk_gpu_test::GrContextFactory::GLContextOptions ctxOptions;
+ sk_gpu_test::GrContextFactory::ContextType ctxType;
+ sk_gpu_test::GrContextFactory::ContextOptions ctxOptions;
bool useDFText;
#else
int bogusInt;