diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-28 04:00:22 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-28 04:00:22 +0000 |
| commit | 00b19257a178914bf74acc18d0c8dc41dddd2915 (patch) | |
| tree | d82f383247f1c21841e3377ca4de8e3e096aa558 /webkit/gpu | |
| parent | a7a6b495aee605f637f0e02dd8c5a89fefb27c72 (diff) | |
| download | chromium_src-00b19257a178914bf74acc18d0c8dc41dddd2915.zip chromium_src-00b19257a178914bf74acc18d0c8dc41dddd2915.tar.gz chromium_src-00b19257a178914bf74acc18d0c8dc41dddd2915.tar.bz2 | |
Add global tracking of GPU memory allocations. Have each ContextGroup push memory tracking information to the GpuMemoryManager. With this we can determine if we transiently oversubscribe.
BUG=135525
TEST=
Review URL: https://chromiumcodereview.appspot.com/10796096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148880 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu')
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index b6b67a8..e3867f5 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -414,7 +414,7 @@ bool GLInProcessContext::Initialize(const gfx::Size& size, bool bind_generates_resource = false; decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group ? context_group->decoder_->GetContextGroup() : - new ::gpu::gles2::ContextGroup(NULL, bind_generates_resource))); + new ::gpu::gles2::ContextGroup(NULL, NULL, bind_generates_resource))); gpu_scheduler_.reset(new GpuScheduler(command_buffer_.get(), decoder_.get(), |