diff options
| author | dyen <dyen@chromium.org> | 2015-12-11 10:59:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-11 18:59:59 +0000 |
| commit | 0060282066d6429e6309a1f6875a38e2c9c0aad8 (patch) | |
| tree | 7d398890f97cf801f1f2cea3336d6905fa0bc3d5 /gpu/blink | |
| parent | 3a6301ed7fd14b05167488a06116d1302668fa75 (diff) | |
| download | chromium_src-0060282066d6429e6309a1f6875a38e2c9c0aad8.zip chromium_src-0060282066d6429e6309a1f6875a38e2c9c0aad8.tar.gz chromium_src-0060282066d6429e6309a1f6875a38e2c9c0aad8.tar.bz2 | |
Added blink support for new sync tokens.
This CL merely adds new blink functions for sync tokens, there are
no functional changes.
This partially reverts commit 08cf4e42f8078a9a4104205811b891069f2fb3d3.
BUG=514815
Review URL: https://codereview.chromium.org/1511183005
Cr-Commit-Position: refs/heads/master@{#364760}
Diffstat (limited to 'gpu/blink')
| -rw-r--r-- | gpu/blink/webgraphicscontext3d_impl.cc | 12 | ||||
| -rw-r--r-- | gpu/blink/webgraphicscontext3d_impl.h | 5 |
2 files changed, 14 insertions, 3 deletions
diff --git a/gpu/blink/webgraphicscontext3d_impl.cc b/gpu/blink/webgraphicscontext3d_impl.cc index a3fc0ed..29141e4 100644 --- a/gpu/blink/webgraphicscontext3d_impl.cc +++ b/gpu/blink/webgraphicscontext3d_impl.cc @@ -223,6 +223,16 @@ bool WebGraphicsContext3DImpl::insertSyncPoint(WGC3Dbyte* sync_token) { return true; } +DELEGATE_TO_GL_R(insertFenceSyncCHROMIUM, InsertFenceSyncCHROMIUM, WGC3Duint64) + +bool WebGraphicsContext3DImpl::genSyncTokenCHROMIUM(WGC3Duint64 fenceSync, + WGC3Dbyte* syncToken) { + gl_->GenSyncTokenCHROMIUM(fenceSync, syncToken); + return true; +} + +DELEGATE_TO_GL_1(waitSyncTokenCHROMIUM, WaitSyncTokenCHROMIUM, const WGC3Dbyte*) + void WebGraphicsContext3DImpl::reshapeWithScaleFactor(int width, int height, float scale) { @@ -901,8 +911,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 97b0026..7e7625b 100644 --- a/gpu/blink/webgraphicscontext3d_impl.h +++ b/gpu/blink/webgraphicscontext3d_impl.h @@ -38,7 +38,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; |