diff options
| author |  bsalomon <bsalomon@google.com> | 2016-03-31 10:22:40 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-31 10:22:40 -0700 |
| commit | 3e4616ff10fad7ee7dae48f465223b4591ec8ffd (patch) | |
| tree | df01f28a98905063005845649a6cff2ea417c626 /tools/kilobench | |
| parent | 062bd860338dbaa8cae38486a338ea97435aed92 (diff) | |
Revert of rename sk_gpu_test::GLContext to sk_gpu_test::GLTestContext (patchset #5 id:80001 of https://codereview.chromium.org/1849463002/ )
Reason for revert:
breaking bots
Original issue's description:
> rename sk_gpu_test::GLContext to sk_gpu_test::GLTestContext
>
> rename subclasses
>
> Fix up the EGL native GLTestContext
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1849463002
>
> TBR=jvanverth@google.com
>
> Committed: https://skia.googlesource.com/skia/+/4c7f0a16312c374eba4e8d5d46435ce9eb0b9971
TBR=jvanverth@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1850543003
Diffstat (limited to 'tools/kilobench')
| -rw-r--r-- | tools/kilobench/kilobench.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/kilobench/kilobench.cpp b/tools/kilobench/kilobench.cpp index f4c2999b91..81238353e2 100644 --- a/tools/kilobench/kilobench.cpp +++ b/tools/kilobench/kilobench.cpp @@ -218,10 +218,10 @@ struct GPUTarget { return true; } - GLTestContext* gl() { return fGL; } + GLContext* gl() { return fGL; } private: - GLTestContext* fGL; + GLContext* fGL; SkAutoTDelete<SkSurface> fSurface; }; @@ -282,7 +282,7 @@ static int clamp_loops(int loops) { static double now_ms() { return SkTime::GetNSecs() * 1e-6; } struct TimingThread { - TimingThread(GLTestContext* mainContext) + TimingThread(GLContext* mainContext) : fFenceSync(mainContext->fenceSync()) , fMainContext(mainContext) , fDone(false) {} @@ -308,8 +308,8 @@ struct TimingThread { void timingLoop() { // Create a context which shares display lists with the main thread - SkAutoTDelete<GLTestContext> glContext(CreatePlatformGLTestContext(kNone_GrGLStandard, - fMainContext)); + SkAutoTDelete<GLContext> glContext(CreatePlatformGLContext(kNone_GrGLStandard, + fMainContext)); glContext->makeCurrent(); // Basic timing methodology is: @@ -405,7 +405,7 @@ private: SyncQueue fFrameEndSyncs; SkTArray<double> fTimings; SkMutex fDoneMutex; - GLTestContext* fMainContext; + GLContext* fMainContext; bool fDone; }; |