diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-12 22:30:07 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-12 22:30:07 +0000 |
| commit | e608ce0911ee1764b93d8cd667d6eabbd083ab96 (patch) | |
| tree | 1438be09f2e2dee426a3bff149a51cd826358cd7 /content/common/gpu/gpu_command_buffer_stub.cc | |
| parent | c5651f4a4e0581a53525ad59bfb1fecfeb6ed6bb (diff) | |
| download | chromium_src-e608ce0911ee1764b93d8cd667d6eabbd083ab96.zip chromium_src-e608ce0911ee1764b93d8cd667d6eabbd083ab96.tar.gz chromium_src-e608ce0911ee1764b93d8cd667d6eabbd083ab96.tar.bz2 | |
Add the ability to share GL contexts across channels.
This is patch 1 of many to enable the use of the GPU process for the browser UI.
Before this, all contexts within one channel were shared, but not across channels. With this patch channels can choose to share contexts with other ones.
This patch also renames the various "renderer_id" to "client_id", since the GPU process doesn't care that the other side is a renderer or not.
BUG=99516
TEST=None yet, but will come with later patches
Review URL: http://codereview.chromium.org/9107033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/gpu/gpu_command_buffer_stub.cc')
| -rw-r--r-- | content/common/gpu/gpu_command_buffer_stub.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc index c27769c9..cb51128 100644 --- a/content/common/gpu/gpu_command_buffer_stub.cc +++ b/content/common/gpu/gpu_command_buffer_stub.cc @@ -30,7 +30,7 @@ GpuCommandBufferStub::GpuCommandBufferStub( const std::vector<int32>& attribs, gfx::GpuPreference gpu_preference, int32 route_id, - int32 renderer_id, + int32 client_id, int32 render_view_id, GpuWatchdog* watchdog, bool software) @@ -44,7 +44,7 @@ GpuCommandBufferStub::GpuCommandBufferStub( route_id_(route_id), software_(software), last_flush_count_(0), - renderer_id_(renderer_id), + client_id_(client_id), render_view_id_(render_view_id), parent_stub_for_initialization_(), parent_texture_for_initialization_(0), @@ -63,7 +63,7 @@ GpuCommandBufferStub::~GpuCommandBufferStub() { GpuChannelManager* gpu_channel_manager = channel_->gpu_channel_manager(); gpu_channel_manager->Send(new GpuHostMsg_DestroyCommandBuffer( - handle_, renderer_id_, render_view_id_)); + handle_, client_id_, render_view_id_)); } bool GpuCommandBufferStub::OnMessageReceived(const IPC::Message& message) { @@ -196,7 +196,7 @@ void GpuCommandBufferStub::OnInitialize( surface_ = ImageTransportSurface::CreateSurface( channel_->gpu_channel_manager(), render_view_id_, - renderer_id_, + client_id_, route_id_, handle_); } else { |