diff options
| author | dyen <dyen@chromium.org> | 2015-11-18 15:19:41 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-18 23:20:20 +0000 |
| commit | 60af6a5108d5bfb1b1eeb64fb1881097a889d70a (patch) | |
| tree | 609d33228f0607e1177de5e467f94987dbaddf03 /gpu/blink | |
| parent | 49fa12e81e620e6af4b411841a98518cc45f67f8 (diff) | |
| download | chromium_src-60af6a5108d5bfb1b1eeb64fb1881097a889d70a.zip chromium_src-60af6a5108d5bfb1b1eeb64fb1881097a889d70a.tar.gz chromium_src-60af6a5108d5bfb1b1eeb64fb1881097a889d70a.tar.bz2 | |
Replaced blink sync points with new sync tokens.
BUG=514815
Review URL: https://codereview.chromium.org/1450063002
Cr-Commit-Position: refs/heads/master@{#360442}
Diffstat (limited to 'gpu/blink')
| -rw-r--r-- | gpu/blink/webgraphicscontext3d_impl.cc | 14 | ||||
| -rw-r--r-- | gpu/blink/webgraphicscontext3d_impl.h | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/gpu/blink/webgraphicscontext3d_impl.cc b/gpu/blink/webgraphicscontext3d_impl.cc index 139dace..b9dc009 100644 --- a/gpu/blink/webgraphicscontext3d_impl.cc +++ b/gpu/blink/webgraphicscontext3d_impl.cc @@ -213,16 +213,16 @@ uint32_t WebGraphicsContext3DImpl::lastFlushID() { return flush_id_; } -bool WebGraphicsContext3DImpl::insertSyncPoint(WGC3Dbyte* sync_token) { - const uint32_t sync_point = gl_->InsertSyncPointCHROMIUM(); - if (!sync_point) - return false; +DELEGATE_TO_GL_R(insertFenceSyncCHROMIUM, InsertFenceSyncCHROMIUM, WGC3Duint64) - gpu::SyncToken sync_token_data(sync_point); - memcpy(sync_token, &sync_token_data, sizeof(sync_token_data)); +bool WebGraphicsContext3DImpl::genSyncTokenCHROMIUM(WGC3Duint64 fenceSync, + WGC3Dbyte* syncToken) { + gl_->GenSyncTokenCHROMIUM(fenceSync, syncToken); return true; } +DELEGATE_TO_GL_1(waitSyncTokenCHROMIUM, WaitSyncTokenCHROMIUM, const WGC3Dbyte*) + DELEGATE_TO_GL_3(reshapeWithScaleFactor, ResizeCHROMIUM, int, int, float) DELEGATE_TO_GL_4R(mapBufferSubDataCHROMIUM, MapBufferSubDataCHROMIUM, WGC3Denum, @@ -888,8 +888,6 @@ void WebGraphicsContext3DImpl::shallowFinishCHROMIUM() { gl_->ShallowFinishCHROMIUM(); } -DELEGATE_TO_GL_1(waitSyncToken, WaitSyncTokenCHROMIUM, const WGC3Dbyte*) - void WebGraphicsContext3DImpl::loseContextCHROMIUM( WGC3Denum current, WGC3Denum other) { gl_->LoseContextCHROMIUM(current, other); diff --git a/gpu/blink/webgraphicscontext3d_impl.h b/gpu/blink/webgraphicscontext3d_impl.h index 6a644c9..81a2667 100644 --- a/gpu/blink/webgraphicscontext3d_impl.h +++ b/gpu/blink/webgraphicscontext3d_impl.h @@ -37,8 +37,10 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl uint32_t lastFlushID() override; - bool insertSyncPoint(blink::WGC3Dbyte* sync_token) override; - void waitSyncToken(const blink::WGC3Dbyte* sync_token) override; + blink::WGC3Duint64 insertFenceSyncCHROMIUM() override; + bool genSyncTokenCHROMIUM(blink::WGC3Duint64 fenceSync, + blink::WGC3Dbyte* syncToken) override; + void waitSyncTokenCHROMIUM(const blink::WGC3Dbyte* syncToken) override; void loseContextCHROMIUM(blink::WGC3Denum current, blink::WGC3Denum other) override; |