diff options
| author |  bsalomon <bsalomon@google.com> | 2016-04-01 13:38:04 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-01 13:38:05 -0700 |
| commit | 2d9c6f81353597aebf5934547e5cba7a872196fb (patch) | |
| tree | 39f4cf8bfe87211cb06ccee76e527e9e6860d59d /tools/skiaserve | |
| parent | 6e2aad4e9f6280aa2b710e7324458fdc6d699ec5 (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 '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 225ca398df..7534b1df98 100644 --- a/tools/skiaserve/Request.cpp +++ b/tools/skiaserve/Request.cpp @@ -65,8 +65,8 @@ SkData* Request::writeCanvasToPng(SkCanvas* canvas) { SkCanvas* Request::getCanvas() { #if SK_SUPPORT_GPU GrContextFactory* factory = fContextFactory; - GLTestContext* gl = factory->getContextInfo(GrContextFactory::kNative_GLContextType, - GrContextFactory::kNone_GLContextOptions).fGLContext; + GLTestContext* gl = factory->getContextInfo(GrContextFactory::kNativeGL_ContextType, + GrContextFactory::kNone_ContextOptions).fGLContext; gl->makeCurrent(); #endif SkASSERT(fDebugCanvas); @@ -109,8 +109,8 @@ SkData* Request::writeOutSkp() { GrContext* Request::getContext() { #if SK_SUPPORT_GPU - return fContextFactory->get(GrContextFactory::kNative_GLContextType, - GrContextFactory::kNone_GLContextOptions); + return fContextFactory->get(GrContextFactory::kNativeGL_ContextType, + GrContextFactory::kNone_ContextOptions); #else return nullptr; #endif |