diff options
| author |  csmartdalton <csmartdalton@google.com> | 2016-09-13 10:41:49 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-13 10:41:50 -0700 |
| commit | 6270e558c31b75d02db6f598e93f2e3b701ccb7f (patch) | |
| tree | 9c330b8761f62ef031f0913aaba00e74b2c91ea3 /tools/skiaserve | |
| parent | 37283c28aa5bea2204c18956e74f83b238d7a891 (diff) | |
Add ContextOptions field to SkCommandLineConfigGpu
Reduces duplicate code by computing the ContextOptions in one spot.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2337163002
Review-Url: https://codereview.chromium.org/2337163002
Diffstat (limited to 'tools/skiaserve')
| -rw-r--r-- | tools/skiaserve/Request.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp index ea2d17afb9..ef1f757595 100644 --- a/tools/skiaserve/Request.cpp +++ b/tools/skiaserve/Request.cpp @@ -72,10 +72,10 @@ SkCanvas* Request::getCanvas() { #if SK_SUPPORT_GPU GrContextFactory* factory = fContextFactory; GLTestContext* gl = factory->getContextInfo(GrContextFactory::kNativeGL_ContextType, - GrContextFactory::kNone_ContextOptions).glContext(); + GrContextFactory::ContextOptions::kNone).glContext(); if (!gl) { gl = factory->getContextInfo(GrContextFactory::kMESA_ContextType, - GrContextFactory::kNone_ContextOptions).glContext(); + GrContextFactory::ContextOptions::kNone).glContext(); } if (gl) { gl->makeCurrent(); @@ -123,10 +123,10 @@ sk_sp<SkData> Request::writeOutSkp() { GrContext* Request::getContext() { #if SK_SUPPORT_GPU GrContext* result = fContextFactory->get(GrContextFactory::kNativeGL_ContextType, - GrContextFactory::kNone_ContextOptions); + GrContextFactory::ContextOptions::kNone); if (!result) { result = fContextFactory->get(GrContextFactory::kMESA_ContextType, - GrContextFactory::kNone_ContextOptions); + GrContextFactory::ContextOptions::kNone); } return result; #else |