Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(290)

Unified Diff: ui/aura/bench/bench_main.cc

Issue 1427543002: Modified old wait sync point functions to also accept new sync tokens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: format Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/ipc_fuzzer/fuzzer/fuzzer.cc ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/bench/bench_main.cc
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc
index ce855720fa62086d7e3e57df962c29cf12508e44..573e23ea909e9da37b0f96c9001c5e31d296a1f6 100644
--- a/ui/aura/bench/bench_main.cc
+++ b/ui/aura/bench/bench_main.cc
@@ -142,10 +142,10 @@ class BenchCompositorObserver : public ui::CompositorObserver {
void ReturnMailbox(scoped_refptr<cc::ContextProvider> context_provider,
GLuint texture,
- GLuint sync_point,
+ const gpu::SyncToken& sync_token,
bool is_lost) {
gpu::gles2::GLES2Interface* gl = context_provider->ContextGL();
- gl->WaitSyncPointCHROMIUM(sync_point);
+ gl->WaitSyncTokenCHROMIUM(sync_token.GetConstData());
gl->DeleteTextures(1, &texture);
gl->ShallowFlushCHROMIUM();
}
@@ -227,7 +227,7 @@ class WebGLBench : public BenchCompositorObserver {
GLuint sync_point = gl->InsertSyncPointCHROMIUM();
webgl_.SetTextureMailbox(
- cc::TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point),
+ cc::TextureMailbox(mailbox, gpu::SyncToken(sync_point), GL_TEXTURE_2D),
cc::SingleReleaseCallback::Create(
base::Bind(ReturnMailbox, context_provider_, texture)),
bounds.size());
« no previous file with comments | « tools/ipc_fuzzer/fuzzer/fuzzer.cc ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698