diff options
| author |  bsalomon <bsalomon@google.com> | 2016-04-04 05:56:59 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-04 05:56:59 -0700 |
| commit | b4b4cf36c66900fdfaf63106d54a8fac786a3313 (patch) | |
| tree | a2edd68802089e9b46d65d187fc6e9e47b398c44 /bench | |
| parent | aee62f563968437bff0ffdc5aa6185781a81bfd3 (diff) | |
Revert of Rename enums in GrContextFactory to remove "GL" (patchset #4 id:60001 of https://codereview.chromium.org/1845923004/ )
Reason for revert:
Many GM images unexpectedly changed with this CL.
Original issue's description:
> 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
>
> Committed: https://skia.googlesource.com/skia/+/2d9c6f81353597aebf5934547e5cba7a872196fb
TBR=egdaniel@google.com,jvanverth@google.com
# Not skipping CQ checks because original CL landed more than 1 days ago.
Review URL: https://codereview.chromium.org/1856703002
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/nanobench.cpp | 16 | ||||
| -rw-r--r-- | bench/nanobench.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 5e26b48395..521824e97b 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 kBogusContextType GrContextFactory::kNativeGL_ContextType -#define kBogusContextOptions GrContextFactory::kNone_ContextOptions +#define kBogusGLContextType GrContextFactory::kNative_GLContextType +#define kBogusGLContextOptions GrContextFactory::kNone_GLContextOptions #else -#define kBogusContextType 0 -#define kBogusContextOptions 0 +#define kBogusGLContextType 0 +#define kBogusGLContextOptions 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_ContextOptions - : GrContextFactory::kNone_ContextOptions; + const auto ctxOptions = gpuConfig->getUseNVPR() ? GrContextFactory::kEnableNVPR_GLContextOptions + : GrContextFactory::kNone_GLContextOptions; 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, kBogusContextType, kBogusContextOptions, false \ + 0, kBogusGLContextType, kBogusGLContextOptions, 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, kBogusContextType, kBogusContextOptions, false }; + 0, kBogusGLContextType, kBogusGLContextOptions, false }; configs->push_back(config); } #endif diff --git a/bench/nanobench.h b/bench/nanobench.h index ceab0f6c4f..844811e26d 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::ContextType ctxType; - sk_gpu_test::GrContextFactory::ContextOptions ctxOptions; + sk_gpu_test::GrContextFactory::GLContextType ctxType; + sk_gpu_test::GrContextFactory::GLContextOptions ctxOptions; bool useDFText; #else int bogusInt; |