10805961ce
Reason for revert: nanobech failing on Android Original issue's description: > Make the Sk GL context class an abstract base class > > Make the Sk GL context class, SkGLNativeContext, an abstract base class. Before, > it depended on ifdefs to implement the platform dependent polymorphism. Move > the logic to subclasses of the various platform implementations. > > This a step to enable Skia embedders to compile dm and bench_pictures. The > concrete goal is to support running these test apps with Chromium command buffer. > > With this change, Chromium can implement its own version of SkGLNativeContext > that uses command buffer, and host the implementation in its own repository. > > Implements the above by renaming the SkGLContextHelper to SkGLContext and > removing the unneeded SkGLNativeContext. Also removes > SkGLNativeContext::AutoRestoreContext functionality, it appeared to be unused: > no use in Skia code, and no tests. > > BUG=skia:2992 > > Committed: https://skia.googlesource.com/skia/+/a90ed4e83897b45d6331ee4c54e1edd4054de9a8 TBR=kkinnunen@nvidia.com NOTREECHECKS=true NOTRY=true BUG=skia:2992 Review URL: https://codereview.chromium.org/639793002
54 lines
1.1 KiB
C++
54 lines
1.1 KiB
C++
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#include "Timer.h"
|
|
|
|
Timer::Timer(SkGLContextHelper* gl)
|
|
: fCpu(-1.0)
|
|
, fWall(-1.0)
|
|
, fTruncatedCpu(-1.0)
|
|
, fTruncatedWall(-1.0)
|
|
, fGpu(-1.0)
|
|
#if SK_SUPPORT_GPU
|
|
, fGpuTimer(gl)
|
|
#endif
|
|
{}
|
|
|
|
void Timer::start() {
|
|
fSysTimer.startWall();
|
|
fTruncatedSysTimer.startWall();
|
|
#if SK_SUPPORT_GPU
|
|
fGpuTimer.start();
|
|
#endif
|
|
fSysTimer.startCpu();
|
|
fTruncatedSysTimer.startCpu();
|
|
}
|
|
|
|
void Timer::end() {
|
|
fCpu = fSysTimer.endCpu();
|
|
#if SK_SUPPORT_GPU
|
|
//It is important to stop the cpu clocks first,
|
|
//as the following will cpu wait for the gpu to finish.
|
|
fGpu = fGpuTimer.end();
|
|
#endif
|
|
fWall = fSysTimer.endWall();
|
|
}
|
|
|
|
void Timer::truncatedEnd() {
|
|
fTruncatedCpu = fTruncatedSysTimer.endCpu();
|
|
fTruncatedWall = fTruncatedSysTimer.endWall();
|
|
}
|
|
|
|
WallTimer::WallTimer() : fWall(-1.0) {}
|
|
|
|
void WallTimer::start() {
|
|
fSysTimer.startWall();
|
|
}
|
|
|
|
void WallTimer::end() {
|
|
fWall = fSysTimer.endWall();
|
|
}
|