aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/gpu/FenceSync.h
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-10-04 12:49:45 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-10-04 12:49:45 -0700
commit56df2de7fb48e879446938f47464c7a2c8223616 (patch)
tree110fd354fbab83a3902f2e94157ec426837c2cfa /tools/gpu/FenceSync.h
parent60b0a2d85cb8f9a8fcb91a77b1994a6177f3725f (diff)
Revert of skpbench: add option for gpu timing (patchset #7 id:120001 of https://codereview.chromium.org/2388433003/ )
Reason for revert: many bots failing Original issue's description: > skpbench: add option for gpu timing > > Adds a gpu timing option with a GL implementation. > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2388433003 > > Committed: https://skia.googlesource.com/skia/+/c06720d06faab3b01eba1b8693e0ac791f06dc96 TBR=egdaniel@google.com,bsalomon@google.com,csmartdalton@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2390383002
Diffstat (limited to 'tools/gpu/FenceSync.h')
-rw-r--r--tools/gpu/FenceSync.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/gpu/FenceSync.h b/tools/gpu/FenceSync.h
index 90ef1daec7..c3f1182621 100644
--- a/tools/gpu/FenceSync.h
+++ b/tools/gpu/FenceSync.h
@@ -13,7 +13,7 @@
namespace sk_gpu_test {
using PlatformFence = intptr_t;
-static constexpr PlatformFence kInvalidFence = 0;
+static constexpr PlatformFence kInvalidPlatformFence = 0;
/*
* This class provides an interface to interact with fence syncs. A fence sync is an object that the
@@ -29,6 +29,6 @@ public:
virtual ~FenceSync() {}
};
-} // namespace sk_gpu_test
+}
#endif