diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 17:21:20 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 17:21:20 +0000 |
| commit | 1e997162a250ffcc8d5d59ba045598d28775a67b (patch) | |
| tree | 33371851963219ea7df5b1f762bf3ba4ea113ade /mojo/gles2 | |
| parent | 6d63e14f3d36266327f87c34fd0eb77072ab1f27 (diff) | |
| download | chromium_src-1e997162a250ffcc8d5d59ba045598d28775a67b.zip chromium_src-1e997162a250ffcc8d5d59ba045598d28775a67b.tar.gz chromium_src-1e997162a250ffcc8d5d59ba045598d28775a67b.tar.bz2 | |
Make Mojo sample app work again.
BUG=
Review URL: https://codereview.chromium.org/288923002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/gles2')
| -rw-r--r-- | mojo/gles2/command_buffer_client_impl.cc | 6 | ||||
| -rw-r--r-- | mojo/gles2/command_buffer_client_impl.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mojo/gles2/command_buffer_client_impl.cc b/mojo/gles2/command_buffer_client_impl.cc index 9c05f4f..d5aebd5 100644 --- a/mojo/gles2/command_buffer_client_impl.cc +++ b/mojo/gles2/command_buffer_client_impl.cc @@ -57,7 +57,8 @@ CommandBufferClientImpl::CommandBufferClientImpl( shared_state_(NULL), last_put_offset_(-1), next_transfer_buffer_id_(0), - initialize_result_(false) { + initialize_result_(false), + async_waiter_(async_waiter) { command_buffer_.set_error_handler(this); command_buffer_->SetClient(this); } @@ -82,7 +83,8 @@ bool CommandBufferClientImpl::Initialize() { sync_dispatcher_.reset(new SyncDispatcher<CommandBufferSyncClient>( sync_pipe.handle0.Pass(), this)); CommandBufferSyncClientPtr sync_client = - MakeProxy<CommandBufferSyncClient>(sync_pipe.handle1.Pass()); + MakeProxy<CommandBufferSyncClient>(sync_pipe.handle1.Pass(), + async_waiter_); AllocationScope scope; command_buffer_->Initialize(sync_client.Pass(), duped.Pass()); // Wait for DidInitialize to come on the sync client pipe. diff --git a/mojo/gles2/command_buffer_client_impl.h b/mojo/gles2/command_buffer_client_impl.h index 5b67524..6aa4baf 100644 --- a/mojo/gles2/command_buffer_client_impl.h +++ b/mojo/gles2/command_buffer_client_impl.h @@ -107,6 +107,7 @@ class CommandBufferClientImpl : public CommandBufferClient, int32 next_transfer_buffer_id_; bool initialize_result_; + MojoAsyncWaiter* async_waiter_; }; } // gles2 |