| commit | 3724e574a744491b7cfb8187ac865a70ef3d4528 | [log] [tgz] |
|---|---|---|
| author | bsalomon <bsalomon@google.com> | Wed Mar 30 18:56:19 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Wed Mar 30 18:56:20 2016 -0700 |
| tree | eb3dd729cbc0adef5ce2b4a2fa048fe21baeb35a | |
| parent | 2238c9dbca4b791edc512957728a18ce14d55912 [diff] [blame] |
Move SkGLContext and some GrGLInterface implementations to skgputest module BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1815823002 CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot Committed: https://skia.googlesource.com/skia/+/fe3456cb006110d045b26ff3f8681b893a757b58 Review URL: https://codereview.chromium.org/1815823002
diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp index 1d946ab..d9e1bda 100644 --- a/tools/skiaserve/Request.cpp +++ b/tools/skiaserve/Request.cpp
@@ -10,6 +10,8 @@ #include "SkPictureRecorder.h" #include "SkPixelSerializer.h" +using namespace sk_gpu_test; + static int kDefaultWidth = 1920; static int kDefaultHeight = 1080; @@ -63,8 +65,8 @@ SkCanvas* Request::getCanvas() { #if SK_SUPPORT_GPU GrContextFactory* factory = fContextFactory; - SkGLContext* gl = factory->getContextInfo(GrContextFactory::kNative_GLContextType, - GrContextFactory::kNone_GLContextOptions).fGLContext; + GLContext* gl = factory->getContextInfo(GrContextFactory::kNative_GLContextType, + GrContextFactory::kNone_GLContextOptions).fGLContext; gl->makeCurrent(); #endif SkASSERT(fDebugCanvas);